Fix additional "New note" when adding a new note

2 files changed, 5 insertions, 12 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
index 2dfaf1d1..383d9e1b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
@@ -24,7 +24,6 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import androidx.lifecycle.LiveData;
 
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
 import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException;
@@ -127,16 +126,10 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
                                 requireActivity().invalidateOptionsMenu();
                             }
                         } else {
-                            requireActivity().runOnUiThread(() -> {
-                                final LiveData<Note> createLiveData$ = db.addNoteAndSync(localAccount, cloudNote);
-                                createLiveData$.observe(requireActivity(), (createdNote) -> {
-                                    note = createdNote;
-                                    originalNote = null;
-                                    requireActivity().runOnUiThread(() -> onNoteLoaded(note));
-                                    requireActivity().invalidateOptionsMenu();
-                                    createLiveData$.removeObservers(requireActivity());
-                                });
-                            });
+                            note = db.addNote(localAccount.getId(), cloudNote);
+                            originalNote = null;
+                            requireActivity().runOnUiThread(() -> onNoteLoaded(note));
+                            requireActivity().invalidateOptionsMenu();
                         }
                     }
                 } else {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
index 05e8955f..3673c082 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
@@ -184,7 +184,7 @@ public abstract class NotesDatabase extends RoomDatabase {
      */
     @NonNull
     @WorkerThread
-    Note addNote(long accountId, Note note) {
+    public Note addNote(long accountId, Note note) {
         Note entity = new Note();
         if (note.getId() > 0) {
             entity.setId(note.getId());