aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <Bananeweizen@gmx.de>2013-01-05 22:33:31 -0800
committerBananeweizen <Bananeweizen@gmx.de>2013-01-05 22:33:31 -0800
commit4302a5521d410a3fb9f387dbedf0636d6f536f5a (patch)
tree1d3795a8eabf91e4a389e233ed91b58653bdf581
parent586001888946ca710f0060de3d2b3be0b64933cf (diff)
parentc9f6a3c09e2073a7eebffc15df58a40c08f25d51 (diff)
downloadcgeo-4302a5521d410a3fb9f387dbedf0636d6f536f5a.zip
cgeo-4302a5521d410a3fb9f387dbedf0636d6f536f5a.tar.gz
cgeo-4302a5521d410a3fb9f387dbedf0636d6f536f5a.tar.bz2
Merge pull request #2331 from campbeb/fix1926
Fix 1926: Don't try to reload cache while still being saved
-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 73675de..2b64924 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1489,7 +1489,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
if (msg.what == -1) {
showToast(res.getString(R.string.err_favorite_failed));
} else {
- updateFavPointBox();
+ CacheDetailActivity.this.notifyDataSetChanged(); // reload cache details
}
}
}
@@ -1596,7 +1596,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 8f867b5..19df7e3 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -335,13 +335,7 @@ public class cgCache implements ICache, IWaypoint {
zoomlevel = other.zoomlevel;
}
- boolean isEqual = isEqualTo(other);
-
- if (!isEqual) {
- notifyChange();
- }
-
- return isEqual;
+ return isEqualTo(other);
}
/**