Merge pull request #1265 from campbeb/fixCacheChange

cacheChangeNotificationHandler must be set each time cache is created

1 files changed, 3 insertions, 5 deletions

diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index dea2b42..d29ed9b 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -635,11 +635,6 @@ public class CacheDetailActivity extends AbstractActivity {
 
                 // Data loaded, we're ready to show it!
                 notifyDataSetChanged();
-                // cache isn't available until after notifyDataSetChanged is called
-                if (cache != null) {
-                    cache.setChangeNotificationHandler(cacheChangeNotificationHandler);
-                }
-
             }
         }
 
@@ -670,6 +665,9 @@ public class CacheDetailActivity extends AbstractActivity {
             return;
         }
 
+        // allow cache to notify CacheDetailActivity when it changes so it can be reloaded
+        cache.setChangeNotificationHandler(cacheChangeNotificationHandler);
+
         // notify all creators that the data has changed
         for (PageViewCreator creator : viewCreators.values()) {
             creator.notifyDataSetChanged();