1 files changed, 31 insertions, 9 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index d3ab633..a59d9b9 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -66,10 +66,12 @@ import org.eclipse.jdt.annotation.Nullable;
 import rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
+import rx.Subscription;
 import rx.android.observables.AndroidObservable;
 import rx.functions.Action0;
 import rx.functions.Action1;
 import rx.subscriptions.CompositeSubscription;
+import rx.subscriptions.Subscriptions;
 
 import android.R.color;
 import android.app.AlertDialog;
@@ -171,6 +173,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
      */
     private Waypoint selectedWaypoint;
 
+    private boolean requireGeodata;
+    private Subscription geoDataSubscription = Subscriptions.empty();
+
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.cachedetail_activity);
@@ -235,7 +240,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                     finish();
                     return;
                 }
-            } else if (uriHost.contains("opencaching.de")) {
+            } else if (uriHost.contains("opencaching.de") || uriHost.contains("opencaching.fr")) {
                 if (StringUtils.startsWith(uriPath, "/oc")) {
                     geocode = uriPath.substring(1).toUpperCase(Locale.US);
                 } else {
@@ -293,8 +298,11 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                 if (getPage(position) == Page.IMAGES) {
                     loadCacheImages();
                 }
+                requireGeodata = getPage(position) == Page.DETAILS;
+                startOrStopGeoDataListener();
             }
         });
+        requireGeodata = pageToOpen == 1;
 
         final String realGeocode = geocode;
         final String realGuid = guid;
@@ -323,9 +331,17 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
         outState.putInt(STATE_PAGE_INDEX, getCurrentItem());
     }
 
+    private void startOrStopGeoDataListener() {
+        geoDataSubscription.unsubscribe();
+        if (requireGeodata) {
+            geoDataSubscription = locationUpdater.start(GeoDirHandler.UPDATE_GEODATA);
+        }
+    }
+
     @Override
     public void onResume() {
-        super.onResume(locationUpdater.start(GeoDirHandler.UPDATE_GEODATA));
+        super.onResume();
+        startOrStopGeoDataListener();
 
         if (refreshOnResume) {
             notifyDataSetChanged();
@@ -334,6 +350,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
     }
 
     @Override
+    public void onPause() {
+        geoDataSubscription.unsubscribe();
+        super.onPause();
+    }
+
+    @Override
     public void onDestroy() {
         createSubscriptions.unsubscribe();
         super.onDestroy();
@@ -910,9 +932,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
                         public void call(final Integer selectedListId) {
                             storeCache(selectedListId, new StoreCacheHandler(CacheDetailActivity.this, progress));
                         }
-                    }, true, StoredList.TEMPORARY_LIST_ID);
+                    }, true, StoredList.TEMPORARY_LIST.id);
         } else {
-            storeCache(StoredList.TEMPORARY_LIST_ID, new StoreCacheHandler(this, progress));
+            storeCache(StoredList.TEMPORARY_LIST.id, new StoreCacheHandler(this, progress));
         }
     }
 
@@ -2223,7 +2245,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             if (UPDATE_LOAD_PROGRESS_DETAIL == msg.what && msg.obj instanceof String) {
                 updateStatusMsg(R.string.cache_dialog_offline_save_message, (String) msg.obj);
             } else {
-                notifyDatasetChanged(activityRef);
+                notifyDataSetChanged(activityRef);
             }
         }
     }
@@ -2239,7 +2261,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             if (UPDATE_LOAD_PROGRESS_DETAIL == msg.what && msg.obj instanceof String) {
                 updateStatusMsg(R.string.cache_dialog_refresh_message, (String) msg.obj);
             } else {
-                notifyDatasetChanged(activityRef);
+                notifyDataSetChanged(activityRef);
             }
         }
     }
@@ -2252,7 +2274,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
         @Override
         public void handleMessage(final Message msg) {
-            notifyDatasetChanged(activityRef);
+            notifyDataSetChanged(activityRef);
         }
     }
 
@@ -2267,12 +2289,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             if (msg.what == MESSAGE_FAILED) {
                 super.handleMessage(msg);
             } else {
-                notifyDatasetChanged(activityRef);
+                notifyDataSetChanged(activityRef);
             }
         }
     }
 
-    private static void notifyDatasetChanged(final WeakReference<AbstractActivity> activityRef) {
+    private static void notifyDataSetChanged(final WeakReference<AbstractActivity> activityRef) {
         final CacheDetailActivity activity = ((CacheDetailActivity) activityRef.get());
         if (activity != null) {
             activity.notifyDataSetChanged();