From 92a7d243bba95870ff7b702fe46447817142f1c7 Mon Sep 17 00:00:00 2001
From: donEgro <egermajer.martin@gmail.com>
Date: Mon, 22 Apr 2013 19:00:03 +0200
Subject: Fixed Issue #708 - Refresh caches + no internet = normal progress.
 Checking refresh in CacheDetailActivity, CachePopup and cgeocaches.

---
 main/src/cgeo/geocaching/CacheDetailActivity.java | 5 +++++
 main/src/cgeo/geocaching/CachePopup.java          | 6 ++++++
 2 files changed, 11 insertions(+)

(limited to 'main')

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 43ce65f..bbc59e6 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1354,6 +1354,11 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     return;
                 }
 
+                if (!Network.isNetworkConnected(getApplicationContext())) {
+                    showToast(getString(R.string.err_server));
+                    return;
+                }
+
                 final RefreshCacheHandler refreshCacheHandler = new RefreshCacheHandler();
 
                 progress.show(CacheDetailActivity.this, res.getString(R.string.cache_dialog_refresh_title), res.getString(R.string.cache_dialog_refresh_message), true, refreshCacheHandler.cancelMessage());
diff --git a/main/src/cgeo/geocaching/CachePopup.java b/main/src/cgeo/geocaching/CachePopup.java
index e6d0148..d51f9f2 100644
--- a/main/src/cgeo/geocaching/CachePopup.java
+++ b/main/src/cgeo/geocaching/CachePopup.java
@@ -3,6 +3,7 @@ package cgeo.geocaching;
 import cgeo.geocaching.activity.Progress;
 import cgeo.geocaching.apps.cache.navi.NavigationAppFactory;
 import cgeo.geocaching.geopoint.Geopoint;
+import cgeo.geocaching.network.Network;
 import cgeo.geocaching.ui.CacheDetailsCreator;
 import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.Log;
@@ -160,6 +161,11 @@ public class CachePopup extends AbstractPopupActivity {
                 return;
             }
 
+            if (!Network.isNetworkConnected(getApplicationContext())) {
+                showToast(getString(R.string.err_server));
+                return;
+            }
+
             final RefreshCacheHandler refreshCacheHandler = new RefreshCacheHandler();
             progress.show(CachePopup.this, res.getString(R.string.cache_dialog_refresh_title), res.getString(R.string.cache_dialog_refresh_message), true, refreshCacheHandler.cancelMessage());
             new RefreshCacheThread(refreshCacheHandler).start();
-- 
cgit v1.1