Feature: Added the ability for restore to also run a clear list befor…

…e restoring.
DroidWorksStudio · Dec 2, 2024 · ac4456d · ac4456d
1 parent 724219f
commit ac4456d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/data/dao/AppInfoDAO.kt b/app/src/main/java/com/github/droidworksstudio/launcher/data/dao/AppInfoDAO.kt
@@ -22,9 +22,13 @@ interface AppInfoDAO {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun restoreAll(apps: List<AppInfo>)
 
+
     @Query("DELETE FROM app")
     suspend fun clearAll()
 
+    @Query("DELETE FROM sqlite_sequence WHERE name = 'app'")
+    suspend fun resetAutoIncrement()
+
     @Update
     suspend fun update(app: AppInfo)
 

diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/helper/AppHelper.kt b/app/src/main/java/com/github/droidworksstudio/launcher/helper/AppHelper.kt
@@ -389,6 +389,8 @@ class AppHelper @Inject constructor() {
                 val type = object : TypeToken<List<AppInfo>>() {}.type
                 val appInfoList: List<AppInfo> = gson.fromJson(jsonString, type)
 
+                // Clear all apps first
+                resetDatabase(dao)
                 // Reinsert data into the database
                 dao.restoreAll(appInfoList)
             } ?: throw Exception("Failed to open input stream from URI")
@@ -398,6 +400,11 @@ class AppHelper @Inject constructor() {
         }
     }
 
+    suspend fun resetDatabase(dao: AppInfoDAO) {
+        dao.clearAll()                // Clears all rows in the table
+        dao.resetAutoIncrement()      // Resets the ID counter
+    }
+
 
     fun getActionType(actionType: Constants.Swipe): NavOptions {
         return when (actionType) {

diff --git a/...rc/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsAdvancedFragment.kt b/...rc/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsAdvancedFragment.kt
@@ -170,7 +170,7 @@ class SettingsAdvancedFragment : Fragment(),
     private fun clearData() {
         preferenceHelper.clearAll(context)
         lifecycleScope.launch {
-            appDAO.clearAll()
+            appHelper.resetDatabase(appDAO)
         }
         Handler(Looper.getMainLooper()).postDelayed({
             AppReloader.restartApp(context)