Fix synchronization issues after offline period

SchoolRepos · Apr 20, 2021 · eb0f739 · eb0f739
1 parent 7e2902a
commit eb0f739
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/data-lib/src/main/java/me/profiluefter/profinote/data/NotesRepository.kt b/data-lib/src/main/java/me/profiluefter/profinote/data/NotesRepository.kt
@@ -44,12 +44,18 @@ class NotesRepository @Inject constructor(
     suspend fun deleteNote(note: Note) {
         val rawNote = local.todoDao().getByLocalID(note.localID)
 
+        if(rawNote.id == "NEW") {
+            local.todoDao().delete(rawNote)
+            return
+        }
+
         if (isNetworkAvailable()) {
             local.todoDao().delete(rawNote)
             try {
                 remote.deleteTodo(rawNote.id.toInt(), username, password)
             } catch (e: Exception) {
                 local.todoDao().insert(rawNote)
+                local.todoDao().scheduleDelete(note.localID)
                 throw RuntimeException("Error while deleting note $note from server", e)
             }
         } else
@@ -96,6 +102,11 @@ class NotesRepository @Inject constructor(
     }
 
     suspend fun synchronize() {
+        if(!isNetworkAvailable()) {
+            Log.w(logTag, "Synchronization ignored since the device is offline")
+            return
+        }
+
         Log.i(logTag, "Starting synchronization...")
         synchronizeLists()
         Log.i(logTag, "Finished list synchronization! Starting todo synchronization...")
@@ -114,13 +125,15 @@ class NotesRepository @Inject constructor(
         Log.d(logTag, "Deleting ${deleteLists.size} todo lists")
         deleteLists.forEach {
             remote.deleteList(it.id.toInt(), username, password)
+            local.listDao().delete(it)
         }
 
         val uploadLists = remainingLocal.filter { it.id == "NEW" }
         Log.d(logTag, "Uploading ${uploadLists.size} todo lists")
         uploadLists.forEach {
             val (_, newID) = remote.newList(it, username, password)
             local.listDao().changeID(it.localID, newID)
+            local.todoDao().changeListID(it.localID, newID)
         }
 
         val remainingLists = local.listDao().getAll()
@@ -173,6 +186,7 @@ class NotesRepository @Inject constructor(
         Log.d(logTag, "Deleting ${deleteTodos.size} todos")
         deleteTodos.forEach {
             remote.deleteTodo(it.id.toInt(), username, password)
+            local.todoDao().delete(it)
         }
 
         val uploadTodos = remainingLocal.filter { it.id == "NEW" }

diff --git a/data-lib/src/main/java/me/profiluefter/profinote/data/local/NotesDatabase.kt b/data-lib/src/main/java/me/profiluefter/profinote/data/local/NotesDatabase.kt
@@ -80,6 +80,9 @@ interface TodoDao {
     @Query("UPDATE rawtodo SET id = :id WHERE localID = :localID")
     suspend fun changeID(localID: Int, id: String)
 
+    @Query("UPDATE rawtodo SET todoListId = :remoteID WHERE localListID = :localID")
+    suspend fun changeListID(localID: Int, remoteID: String)
+
     @Delete
     suspend fun delete(rawTodo: RawTodo)