Loading app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java +1 −1 Original line number Diff line number Diff line Loading @@ -226,7 +226,7 @@ abstract class NotesServerSyncTask extends Thread { return false; } final var fetchResponse = notesAPI.getNotes(localAccount.getModified(), localAccount.getETag()).blockingSingle(); final var fetchResponse = notesAPI.getNotes(modified, localAccount.getETag()).blockingSingle(); final var remoteNotes = fetchResponse.getResponse(); final var remoteIDs = new HashSet<Long>(); // pull remote changes: update or create each remote note Loading app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java +1 −0 Original line number Diff line number Diff line Loading @@ -88,6 +88,7 @@ public class NotesServerSyncTaskTest { @Test public void testPullRemoteChanges() { when(account.getModified()).thenReturn(Calendar.getInstance()); when(repo.getAccountById(anyLong())).thenReturn(account); when(repo.getIdMap(anyLong())).thenReturn(Map.of(1000L, 1L, 2000L, 2L)); when(repo.updateIfNotModifiedLocallyAndAnyRemoteColumnHasChanged(anyLong(), anyLong(), anyString(), anyBoolean(), anyString(), anyString(), anyString(), anyString())).thenReturn(1); Loading Loading
app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java +1 −1 Original line number Diff line number Diff line Loading @@ -226,7 +226,7 @@ abstract class NotesServerSyncTask extends Thread { return false; } final var fetchResponse = notesAPI.getNotes(localAccount.getModified(), localAccount.getETag()).blockingSingle(); final var fetchResponse = notesAPI.getNotes(modified, localAccount.getETag()).blockingSingle(); final var remoteNotes = fetchResponse.getResponse(); final var remoteIDs = new HashSet<Long>(); // pull remote changes: update or create each remote note Loading
app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java +1 −0 Original line number Diff line number Diff line Loading @@ -88,6 +88,7 @@ public class NotesServerSyncTaskTest { @Test public void testPullRemoteChanges() { when(account.getModified()).thenReturn(Calendar.getInstance()); when(repo.getAccountById(anyLong())).thenReturn(account); when(repo.getIdMap(anyLong())).thenReturn(Map.of(1000L, 1L, 2000L, 2L)); when(repo.updateIfNotModifiedLocallyAndAnyRemoteColumnHasChanged(anyLong(), anyLong(), anyString(), anyBoolean(), anyString(), anyString(), anyString(), anyString())).thenReturn(1); Loading