NF: refactor syncFunction

ankidroid · Oct 13, 2022 · bd818a0 · bd818a0
1 parent 7462666
commit bd818a0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt
@@ -1556,11 +1556,6 @@ open class DeckPicker :
         return false
     }
 
-    // Sync with Anki Web
-    override fun sync() {
-        sync(null)
-    }
-
     /**
      * The mother of all syncing attempts. This might be called from sync() as first attempt to sync a collection OR
      * from the mSyncConflictResolutionListener if the first attempt determines that a full-sync is required.

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.kt
@@ -33,8 +33,7 @@ class SyncErrorDialog : AsyncDialogFragment() {
         fun showSyncErrorDialog(dialogType: Int)
         fun showSyncErrorDialog(dialogType: Int, message: String?)
         fun loginToSyncServer()
-        fun sync()
-        fun sync(conflict: ConflictResolution?)
+        fun sync(conflict: ConflictResolution? = null)
         fun mediaCheck()
         fun dismissAllDialogFragments()
         fun integrityCheck()