wip: error and conflict handling when switching edit modes

Signed-off-by: Álvaro Brey <[email protected]>

Author: AlvaroBrey

app/src/main/java/it/niedermann/owncloud/notes/NotesApplication.java

@@ -5,6 +5,7 @@
 import android.app.Application;
 import android.content.Context;
 import android.util.Log;
+import android.webkit.WebView;
 
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
@@ -29,6 +30,9 @@ public void onCreate() {
         lockedPreference = prefs.getBoolean(getString(R.string.pref_key_lock), false);
         isGridViewEnabled = getDefaultSharedPreferences(this).getBoolean(getString(R.string.pref_key_gridview), false);
         super.onCreate();
+        if (BuildConfig.DEBUG) {
+            WebView.setWebContentsDebuggingEnabled(true);
+        }
     }
 
     public static void setAppTheme(DarkModeSetting setting) {

app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java

@@ -71,6 +71,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
     private Note originalNote;
     private int originalScrollY;
     protected NotesRepository repo;
+    @Nullable
     protected NoteFragmentListener listener;
     private boolean titleModified = false;
 
@@ -106,6 +107,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                         }
                         isNew = false;
                         note = originalNote = repo.getNoteById(id);
+                        Log.d(TAG, "TESTING: retrieved note: " + note);
                         requireActivity().runOnUiThread(() -> onNoteLoaded(note));
                         requireActivity().invalidateOptionsMenu();
                     } else {
@@ -241,7 +243,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     .show(requireActivity().getSupportFragmentManager(), BaseNoteFragment.class.getSimpleName()));
             return true;
         } else if (itemId == R.id.menu_share) {
-            ShareUtil.openShareDialog(requireContext(), note.getTitle(), note.getContent());
+            shareNote();
             return false;
         } else if (itemId == MENU_ID_PIN) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -264,6 +266,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    protected void shareNote() {
+        ShareUtil.openShareDialog(requireContext(), note.getTitle(), note.getContent());
+    }
+
     @CallSuper
     protected void onNoteLoaded(Note note) {
         this.originalScrollY = note.getScrollY();
@@ -387,6 +393,6 @@ enum Mode {
 
         void onNoteUpdated(Note note);
 
-        void changeMode(@NonNull Mode mode);
+        void changeMode(@NonNull Mode mode, boolean reloadNote);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java

@@ -150,33 +150,40 @@ private void launchExistingNote(long accountId, long noteId) {
         launchExistingNote(accountId, noteId, null);
     }
 
+    private void launchExistingNote(long accountId, long noteId, @Nullable final String mode) {
+        launchExistingNote(accountId, noteId, mode, false);
+    }
 
     /**
      * Starts a {@link NoteEditFragment} or {@link NotePreviewFragment} for an existing note.
      *
-     * @param noteId ID of the existing note.
-     * @param mode   View-mode of the fragment (pref value or null). If null will be chosen based on
-     *               user preferences.
+     * @param noteId       ID of the existing note.
+     * @param mode         View-mode of the fragment (pref value or null). If null will be chosen based on
+     *                     user preferences.
+     * @param discardState If true, the state of the fragment will be discarded and a new fragment will be created
      */
-    private void launchExistingNote(long accountId, long noteId, @Nullable final String mode) {
+    private void launchExistingNote(long accountId, long noteId, @Nullable final String mode, final boolean discardState) {
         // save state of the fragment in order to resume with the same note and originalNote
-        Fragment.SavedState savedState = null;
-        if (fragment != null) {
-            savedState = getSupportFragmentManager().saveFragmentInstanceState(fragment);
-        }
-        fragment = getNoteFragment(accountId, noteId, mode);
+        runOnUiThread(() -> {
+            Fragment.SavedState savedState = null;
+            if (fragment != null && !discardState) {
+                savedState = getSupportFragmentManager().saveFragmentInstanceState(fragment);
+            }
+            fragment = getNoteFragment(accountId, noteId, mode);
 
-        if (savedState != null) {
-            fragment.setInitialSavedState(savedState);
-        }
-        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container_view, fragment).commit();
-        if(!fragment.shouldShowToolbar()){
-            binding.toolbar.setVisibility(View.GONE);
-        }else {
-            binding.toolbar.setVisibility(View.VISIBLE);
-        }
+            if (savedState != null) {
+                fragment.setInitialSavedState(savedState);
+            }
+            getSupportFragmentManager().beginTransaction().replace(R.id.fragment_container_view, fragment).commit();
+            if (!fragment.shouldShowToolbar()) {
+                binding.toolbar.setVisibility(View.GONE);
+            } else {
+                binding.toolbar.setVisibility(View.VISIBLE);
+            }
+        });
     }
 
+
     private String getPreferenceMode() {
         final var prefKeyNoteMode = getString(R.string.pref_key_note_mode);
         final var prefKeyLastMode = getString(R.string.pref_key_last_note_mode);
@@ -289,10 +296,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
             close();
             return true;
         } else if (itemId == R.id.menu_preview) {
-            changeMode(Mode.PREVIEW);
+            changeMode(Mode.PREVIEW, false);
             return true;
         } else if (itemId == R.id.menu_edit) {
-            changeMode(Mode.EDIT);
+            changeMode(Mode.EDIT, false);
             return true;
         }
         return super.onOptionsItemSelected(item);
@@ -340,18 +347,18 @@ public void onNoteUpdated(Note note) {
     }
 
     @Override
-    public void changeMode(@NonNull Mode mode) {
+    public void changeMode(@NonNull Mode mode, boolean reloadNote) {
         switch (mode) {
             case EDIT:
-                launchExistingNote(getAccountId(), getNoteId(), getString(R.string.pref_value_mode_edit));
+                launchExistingNote(getAccountId(), getNoteId(), getString(R.string.pref_value_mode_edit), reloadNote);
                 break;
             case PREVIEW:
-                launchExistingNote(getAccountId(), getNoteId(), getString(R.string.pref_value_mode_preview));
+                launchExistingNote(getAccountId(), getNoteId(), getString(R.string.pref_value_mode_preview), reloadNote);
                 break;
             case DIRECT_EDIT:
                 // TODO deal with conflict when doing some edits and then changing to direct edit
                 // TODO deal with note not created yet on server
-                launchExistingNote(getAccountId(), getNoteId(), getString(R.string.pref_value_mode_direct_edit));
+                launchExistingNote(getAccountId(), getNoteId(), getString(R.string.pref_value_mode_direct_edit), reloadNote);
                 break;
             default:
                 throw new IllegalStateException("Unknown mode: " + mode);