diff options
| author | Bananeweizen <Bananeweizen@gmx.de> | 2013-01-04 23:30:38 -0800 |
|---|---|---|
| committer | Bananeweizen <Bananeweizen@gmx.de> | 2013-01-04 23:30:38 -0800 |
| commit | 656e92453fcf0e9d7da137cd4c3551b6530e9969 (patch) | |
| tree | 70c44553abcc9ab48100ad13f39bc382b2979d50 /main | |
| parent | d7a9b4640360dab7494c66e5c94790da74a62a2e (diff) | |
| parent | be1ff37d51312725611c045e77b936c0bb4a5434 (diff) | |
| download | cgeo-656e92453fcf0e9d7da137cd4c3551b6530e9969.zip cgeo-656e92453fcf0e9d7da137cd4c3551b6530e9969.tar.gz cgeo-656e92453fcf0e9d7da137cd4c3551b6530e9969.tar.bz2 | |
Merge pull request #2334 from campbeb/fix2332
Fix #2332. Add error handling for failed favorite changes
Diffstat (limited to 'main')
| -rw-r--r-- | main/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index b2d735f..222a4b2 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -165,7 +165,8 @@ <string name="err_load_descr_failed">c:geo can\'t load description.</string> <string name="err_location_unknown">c:geo doesn\'t know location of cache.</string> <string name="err_missing_device_name">Please enter a device name before registering.</string> - + <string name="err_favorite_failed">Changing favorite status failed.</string> + <string name="err_tb_display">c:geo can\'t display trackable you want. Is it really a trackable?</string> <string name="err_tb_details_open">c:geo can\'t open trackable details.</string> <string name="err_tb_forgot_saw">c:geo forgot which trackable you saw.</string> diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 80441a4..b0398a1 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -1485,7 +1485,12 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc private class FavoriteUpdateHandler extends Handler { @Override public void handleMessage(Message msg) { - updateFavPointBox(); + progress.dismiss(); + if (msg.what == -1) { + showToast(res.getString(R.string.err_favorite_failed)); + } else { + updateFavPointBox(); + } } } |