aboutsummaryrefslogtreecommitdiffstats
path: root/main/src
diff options
context:
space:
mode:
authorBrian <bpcampbell@gmail.com>2013-01-04 19:19:50 -1000
committerBrian <bpcampbell@gmail.com>2013-01-04 19:19:50 -1000
commitabeeb296973370c18331cc5b8aeaa7b7acfde711 (patch)
tree558668d8b826c6cd25d182fa98cbbee825d7f3f8 /main/src
parentd7a9b4640360dab7494c66e5c94790da74a62a2e (diff)
downloadcgeo-abeeb296973370c18331cc5b8aeaa7b7acfde711.zip
cgeo-abeeb296973370c18331cc5b8aeaa7b7acfde711.tar.gz
cgeo-abeeb296973370c18331cc5b8aeaa7b7acfde711.tar.bz2
Fix 1926: Don't try to reload cache while still being saved
cgCache.gatherMissingFrom could cause the cache to be reloaded in cache details while it was still being saved to the database
Diffstat (limited to 'main/src')
-rw-r--r--main/src/cgeo/geocaching/CacheDetailActivity.java4
-rw-r--r--main/src/cgeo/geocaching/cgCache.java8
2 files changed, 3 insertions, 9 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 80441a4..1a4b43b 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1485,7 +1485,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
private class FavoriteUpdateHandler extends Handler {
@Override
public void handleMessage(Message msg) {
- updateFavPointBox();
+ CacheDetailActivity.this.notifyDataSetChanged(); // reload cache details
}
}
@@ -1591,7 +1591,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
if (msg.what == -1) {
showToast(res.getString(R.string.err_watchlist_failed));
} else {
- updateWatchlistBox();
+ CacheDetailActivity.this.notifyDataSetChanged(); // reload cache details
}
}
}
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 0f5315e..cb1747a 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -334,13 +334,7 @@ public class cgCache implements ICache, IWaypoint {
zoomlevel = other.zoomlevel;
}
- boolean isEqual = isEqualTo(other);
-
- if (!isEqual) {
- notifyChange();
- }
-
- return isEqual;
+ return isEqualTo(other);
}
/**