aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2011-10-09 12:48:39 +0200
committerBananeweizen <bananeweizen@gmx.de>2011-10-09 12:48:39 +0200
commit923b5bac08f39ee23d2f2e7abeb01bf777d8150b (patch)
treed2489b91793e5e9c57d51968b2522e3d606fd7d8
parent119d6a87f45e1455c3f747bd8e652be20c10e632 (diff)
downloadcgeo-923b5bac08f39ee23d2f2e7abeb01bf777d8150b.zip
cgeo-923b5bac08f39ee23d2f2e7abeb01bf777d8150b.tar.gz
cgeo-923b5bac08f39ee23d2f2e7abeb01bf777d8150b.tar.bz2
fix #644: Cache note not removed after deleting at gc.com
-rw-r--r--main/src/cgeo/geocaching/cgCache.java2
-rw-r--r--main/src/cgeo/geocaching/cgeodetail.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/cgCache.java b/main/src/cgeo/geocaching/cgCache.java
index 9bc8b38..e800600 100644
--- a/main/src/cgeo/geocaching/cgCache.java
+++ b/main/src/cgeo/geocaching/cgCache.java
@@ -165,7 +165,7 @@ public class cgCache implements ICache {
if (elevation == null) {
elevation = other.elevation;
}
- if (StringUtils.isBlank(personalNote)) {
+ if (personalNote == null) { // don't use StringUtils.isBlank. Otherwise we cannot recognize a note which was deleted on GC
personalNote = other.personalNote;
}
if (StringUtils.isBlank(shortdesc)) {
diff --git a/main/src/cgeo/geocaching/cgeodetail.java b/main/src/cgeo/geocaching/cgeodetail.java
index faee29e..6689cff 100644
--- a/main/src/cgeo/geocaching/cgeodetail.java
+++ b/main/src/cgeo/geocaching/cgeodetail.java
@@ -969,6 +969,9 @@ public class cgeodetail extends AbstractActivity {
personalNoteText.setText(cache.personalNote, TextView.BufferType.SPANNABLE);
personalNoteText.setMovementMethod(LinkMovementMethod.getInstance());
}
+ else {
+ ((LinearLayout) findViewById(R.id.personalnote_box)).setVisibility(View.GONE);
+ }
// cache short desc
if (StringUtils.isNotBlank(cache.shortdesc)) {