From 4d35eb7ac0b905fe1281eeed3b9bd0e3beea395a Mon Sep 17 00:00:00 2001
From: Bananeweizen <bananeweizen@gmx.de>
Date: Sat, 11 May 2013 14:04:07 +0200
Subject: fix #2712: Enable personal note editing for unstored caches

---
 main/res/values/strings.xml                       |  2 +
 main/src/cgeo/geocaching/CacheDetailActivity.java | 84 ++++++++++++++++-------
 2 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 0ed800f..c17e243 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -524,6 +524,8 @@
   <string name="cache_log_image_default_title">Photo</string>
   <string name="cache_personal_note">Personal note</string>
   <string name="cache_personal_note_edit">Edit</string>
+  <string name="cache_personal_note_unstored">Cache not stored</string>
+  <string name="cache_personal_note_store">The cache will be stored first to enable personal notes.</string>
   <string name="cache_description">Description</string>
   <string name="cache_description_long">Long Description</string>
   <string name="cache_description_table_note">Description contains table formatting which may need to be viewed at %s to be seen correctly.</string>
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java
index 46df8cd..cf093af 100644
--- a/main/src/cgeo/geocaching/CacheDetailActivity.java
+++ b/main/src/cgeo/geocaching/CacheDetailActivity.java
@@ -1,5 +1,8 @@
 package cgeo.geocaching;
 
+import butterknife.InjectView;
+import butterknife.Views;
+
 import cgeo.calendar.ICalendar;
 import cgeo.geocaching.activity.AbstractViewPagerActivity;
 import cgeo.geocaching.activity.Progress;
@@ -1734,7 +1737,9 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
 
     }
 
-    private class DescriptionViewCreator extends AbstractCachingPageViewCreator<ScrollView> {
+    protected class DescriptionViewCreator extends AbstractCachingPageViewCreator<ScrollView> {
+
+        @InjectView(R.id.personalnote) protected TextView personalNoteView;
 
         @Override
         public ScrollView getDispatchedView() {
@@ -1744,6 +1749,7 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             }
 
             view = (ScrollView) getLayoutInflater().inflate(R.layout.cacheview_description, null);
+            Views.inject(this, view);
 
             // cache short description
             if (StringUtils.isNotBlank(cache.getShortDescription())) {
@@ -1767,31 +1773,20 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             }
 
             // cache personal note
-            final TextView personalNoteView = (TextView) view.findViewById(R.id.personalnote);
-            setPersonalNote(personalNoteView);
+            setPersonalNote();
             personalNoteView.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             registerForContextMenu(personalNoteView);
             final Button personalNoteEdit = (Button) view.findViewById(R.id.edit_personalnote);
-            if (cache.isOffline()) {
-                personalNoteEdit.setVisibility(View.VISIBLE);
-                personalNoteEdit.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        editNoteDialogListener = new EditNoteDialogListener() {
-                            @Override
-                            public void onFinishEditNoteDialog(final String note) {
-                                cache.setPersonalNote(note);
-                                setPersonalNote(personalNoteView);
-                                cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));                            }
-                        };
-                        final FragmentManager fm = getSupportFragmentManager();
-                        final EditNoteDialog dialog = EditNoteDialog.newInstance(cache.getPersonalNote());
-                        dialog.show(fm, "fragment_edit_note");
+            personalNoteEdit.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (cache.isOffline()) {
+                        editPersonalNote();
+                    } else {
+                        warnPersonalNoteNeedsStoring();
                     }
-                });
-            } else {
-                personalNoteEdit.setVisibility(View.INVISIBLE);
-            }
+                }
+            });
 
             // cache hint and spoiler images
             final View hintBoxView = view.findViewById(R.id.hint_box);
@@ -1844,7 +1839,23 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             return view;
         }
 
-        private void setPersonalNote(final TextView personalNoteView) {
+        private void editPersonalNote() {
+            if (cache.isOffline()) {
+                editNoteDialogListener = new EditNoteDialogListener() {
+                    @Override
+                    public void onFinishEditNoteDialog(final String note) {
+                        cache.setPersonalNote(note);
+                        setPersonalNote();
+                        cgData.saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));
+                    }
+                };
+                final FragmentManager fm = getSupportFragmentManager();
+                final EditNoteDialog dialog = EditNoteDialog.newInstance(cache.getPersonalNote());
+                dialog.show(fm, "fragment_edit_note");
+            }
+        }
+
+        private void setPersonalNote() {
             final String personalNote = cache.getPersonalNote();
             personalNoteView.setText(personalNote, TextView.BufferType.SPANNABLE);
             if (StringUtils.isNotBlank(personalNote)) {
@@ -1863,6 +1874,33 @@ public class CacheDetailActivity extends AbstractViewPagerActivity<CacheDetailAc
             new LoadDescriptionTask(cache.getDescription(), view.findViewById(R.id.longdesc), view.findViewById(R.id.loading), view.findViewById(R.id.shortdesc)).execute();
         }
 
+        private void warnPersonalNoteNeedsStoring() {
+            final AlertDialog.Builder builder = new AlertDialog.Builder(CacheDetailActivity.this);
+            builder.setTitle(R.string.cache_personal_note_unstored);
+            builder.setMessage(R.string.cache_personal_note_store);
+            builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    // do nothing
+                }
+            });
+
+            builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    dialog.dismiss();
+                    cache.store(null);
+                    editPersonalNote();
+                }
+
+            });
+            final AlertDialog dialog = builder.create();
+            dialog.setOwnerActivity(CacheDetailActivity.this);
+            dialog.show();
+        }
+
     }
 
     @Override
-- 
cgit v1.1