diff options
| author | Marco Jacob <mjacob@union06.de> | 2013-11-02 07:55:56 +0100 |
|---|---|---|
| committer | Marco Jacob <mjacob@union06.de> | 2013-11-04 18:24:15 +0100 |
| commit | a23957d148929a2ac0c463c88ddd09104fd5f9bb (patch) | |
| tree | 182c5d52c47f8ad50688e25745ce9bcb575a5fcc /main/src/cgeo/geocaching/PersonalNote.java | |
| parent | bd9535698bd9239bc6e60580c20e6c275449ff61 (diff) | |
| download | cgeo-a23957d148929a2ac0c463c88ddd09104fd5f9bb.zip cgeo-a23957d148929a2ac0c463c88ddd09104fd5f9bb.tar.gz cgeo-a23957d148929a2ac0c463c88ddd09104fd5f9bb.tar.bz2 | |
fixes #3325 - warning on upload if personal note exceeds 4000
Diffstat (limited to 'main/src/cgeo/geocaching/PersonalNote.java')
| -rw-r--r-- | main/src/cgeo/geocaching/PersonalNote.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/PersonalNote.java b/main/src/cgeo/geocaching/PersonalNote.java index 82e88f7..129b765 100644 --- a/main/src/cgeo/geocaching/PersonalNote.java +++ b/main/src/cgeo/geocaching/PersonalNote.java @@ -70,8 +70,10 @@ public class PersonalNote { private PersonalNote mergeOnlyProviderNotes(final PersonalNote other) { final PersonalNote result = new PersonalNote(); if (StringUtils.isNotEmpty(other.providerNote) && StringUtils.isNotEmpty(providerNote)) { - if (providerNote.equals(other.providerNote)) { - result.providerNote = providerNote; + // Don't overwrite a stored personal note if provider note is different. + // Prevents the local personal note from being overwritten by a truncated note from GC.com. + if (StringUtils.startsWith(other.providerNote, providerNote)) { + result.providerNote = other.providerNote; return result; } if (other.isOffline) { |