fix race condition & update

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

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

@@ -783,8 +783,15 @@ public void onNoteClick(int position, View v) {
 
     @Override
     public void onNoteFavoriteClick(int position, View view) {
-        final var toggleLiveData = mainViewModel.toggleFavoriteAndSync(((Note) adapter.getItem(position)));
-        toggleLiveData.observe(this, (next) -> toggleLiveData.removeObservers(this));
+        if (!(adapter.getItem(position) instanceof Note note)) {
+            return;
+        }
+
+        final var toggleLiveData = mainViewModel.toggleFavoriteAndSync(note);
+        toggleLiveData.observe(this, (next) -> {{
+            toggleLiveData.removeObservers(this);
+            adapter.notifyItemChanged(position);
+        }});
     }
 
     @Override

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

@@ -514,14 +514,14 @@ public LiveData<Note> moveNoteToAnotherAccount(Account account, long noteId) {
     }
 
     public LiveData<Void> toggleFavoriteAndSync(Note note) {
-        return switchMap(getCurrentAccount(), currentAccount -> {
-            if (currentAccount != null) {
-                Log.v(TAG, "[toggleFavoriteAndSync] - currentAccount: " + currentAccount.getAccountName());
-                repo.toggleFavoriteAndSync(currentAccount, note);
-            }
+        final var currentAccount = getCurrentAccount().getValue();
 
-            return new MutableLiveData<>(null);
-        });
+        if (currentAccount != null) {
+            Log.v(TAG, "[toggleFavoriteAndSync] - currentAccount: " + currentAccount.getAccountName());
+            repo.toggleFavoriteAndSync(currentAccount, note);
+        }
+
+        return new MutableLiveData<>(null);
     }
 
     public LiveData<Void> deleteNoteAndSync(long id) {

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java

@@ -540,7 +540,6 @@ public Map<Long, Long> getIdMap(long accountId) {
                 .collect(toMap(Note::getRemoteId, Note::getId));
     }
 
-    // FIXME: RACE CONDITION
     @AnyThread
     public void toggleFavoriteAndSync(Account account, Note note) {
         executor.submit(() -> {
@@ -553,8 +552,8 @@ public void toggleFavoriteAndSync(Account account, Note note) {
                 if (response.isSuccessful()) {
                     final var updatedNote = response.body();
                     if (updatedNote != null) {
-                        db.getNoteDao().updateNote(updatedNote);
-                        scheduleSync(account, true);
+                        //db.getNoteDao().updateNote(note);
+                        scheduleSync(account, false);
                     }
                 }
             } catch (Exception e) {