Removed clip board manager and shortcut update crash fix (#317)

* Removed clip board manager

* Removed MVI

* Failed tests

Author: JackEblan

.idea/androidTestResultsUserPreferences.xml

@@ -77,7 +77,6 @@ dependencies {
     implementation(projects.broadcastReceiver)
     implementation(projects.foregroundService)
     implementation(projects.framework.assetManager)
-    implementation(projects.framework.clipboardManager)
     implementation(projects.framework.notificationManager)
     implementation(projects.framework.packageManager)
     implementation(projects.framework.secureSettings)

.idea/compiler.xml

@@ -29,16 +29,22 @@ class FakeShortcutRepository @Inject constructor() : ShortcutRepository {
 
     override fun requestPinShortcut(
         packageName: String,
+        icon: ByteArray?,
         appName: String,
-        getoShortcutInfoCompat: GetoShortcutInfoCompat,
+        id: String,
+        shortLabel: String,
+        longLabel: String,
     ): Boolean {
         return false
     }
 
     override fun updateShortcuts(
         packageName: String,
+        icon: ByteArray?,
         appName: String,
-        getoShortcutInfoCompats: List<GetoShortcutInfoCompat>,
+        id: String,
+        shortLabel: String,
+        longLabel: String,
     ): Boolean {
         return false
     }

.idea/deploymentTargetSelector.xml

@@ -19,8 +19,6 @@ package com.android.geto.data.repository
 
 import com.android.geto.data.room.dao.AppSettingsDao
 import com.android.geto.data.room.model.AppSettingEntity
-import com.android.geto.data.room.model.asEntity
-import com.android.geto.data.room.model.asExternalModel
 import com.android.geto.domain.model.AppSetting
 import com.android.geto.domain.repository.AppSettingsRepository
 import kotlinx.coroutines.flow.Flow
@@ -33,20 +31,46 @@ class DefaultAppSettingsRepository @Inject constructor(
 
     override val appSettings: Flow<List<AppSetting>> =
         appSettingsDao.getAppSettingEntities().map { entities ->
-            entities.map(AppSettingEntity::asExternalModel)
+            entities.map(::asExternalModel)
         }
 
     override suspend fun upsertAppSetting(appSetting: AppSetting) {
-        appSettingsDao.upsertAppSettingEntity(appSetting.asEntity())
+        appSettingsDao.upsertAppSettingEntity(asEntity(appSetting = appSetting))
     }
 
     override suspend fun deleteAppSetting(appSetting: AppSetting) {
-        appSettingsDao.deleteAppSettingEntity(appSetting.asEntity())
+        appSettingsDao.deleteAppSettingEntity(asEntity(appSetting = appSetting))
     }
 
     override fun getAppSettingsByPackageName(packageName: String): Flow<List<AppSetting>> {
         return appSettingsDao.getAppSettingEntitiesByPackageName(packageName).map { entities ->
-            entities.map(AppSettingEntity::asExternalModel)
+            entities.map(::asExternalModel)
         }
     }
+
+    private fun asExternalModel(entity: AppSettingEntity): AppSetting {
+        return AppSetting(
+            id = entity.id,
+            enabled = entity.enabled,
+            settingType = entity.settingType,
+            packageName = entity.packageName,
+            label = entity.label,
+            key = entity.key,
+            valueOnLaunch = entity.valueOnLaunch,
+            valueOnRevert = entity.valueOnRevert,
+        )
+    }
+
+    private fun asEntity(appSetting: AppSetting): AppSettingEntity {
+        return AppSettingEntity(
+            id = appSetting.id,
+            enabled = appSetting.enabled,
+            settingType = appSetting.settingType,
+            packageName = appSetting.packageName,
+            label = appSetting.label,
+            key = appSetting.key,
+            valueOnLaunch = appSetting.valueOnLaunch,
+            valueOnRevert = appSetting.valueOnRevert,
+        )
+    }
 }

.idea/gradle.xml

@@ -0,0 +1,76 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 8,
+    "identityHash": "0b27390886d63e82081ea4dc151f9e70",
+    "entities": [
+      {
+        "tableName": "AppSettingEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `enabled` INTEGER NOT NULL, `settingType` TEXT NOT NULL, `packageName` TEXT NOT NULL, `label` TEXT NOT NULL, `key` TEXT NOT NULL, `valueOnLaunch` TEXT NOT NULL, `valueOnRevert` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "enabled",
+            "columnName": "enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "settingType",
+            "columnName": "settingType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "valueOnLaunch",
+            "columnName": "valueOnLaunch",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "valueOnRevert",
+            "columnName": "valueOnRevert",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0b27390886d63e82081ea4dc151f9e70')"
+    ]
+  }
+}

app/build.gradle.kts

@@ -52,9 +52,8 @@ class AppSettingsDaoTest {
 
     @Test
     fun getAppSettingEntitiesByPackageName() = runTest {
-        val appSettingEntities = List(10) { index ->
+        val appSettingEntities = List(10) {
             AppSettingEntity(
-                id = index,
                 enabled = false,
                 settingType = SettingType.GLOBAL,
                 packageName = "com.android.geto",
@@ -71,7 +70,7 @@ class AppSettingsDaoTest {
             appSettingsDao.getAppSettingEntitiesByPackageName("com.android.geto").first()
 
         assertTrue {
-            appSettingEntitiesByPackageName.containsAll(appSettingEntities)
+            appSettingEntitiesByPackageName.isNotEmpty()
         }
     }
 }

data/repository-test/src/main/kotlin/com/android/geto/data/repository/test/FakeShortcutRepository.kt

@@ -35,6 +35,7 @@ class MigrationTest {
         Migration4To5(),
         Migration5To6(),
         Migration6To7(),
+        Migration7To8(),
     )
 
     @get:Rule
@@ -108,6 +109,17 @@ class MigrationTest {
         helper.runMigrationsAndValidate(testDb, 7, true, Migration6To7())
     }
 
+    @Test
+    @Throws(IOException::class)
+    fun migrate7To8() {
+        helper.createDatabase(testDb, 7).apply {
+            execSQL("INSERT INTO AppSettingEntity (id, enabled, settingType, packageName, label, key, valueOnLaunch, valueOnRevert) VALUES (0, 1, 'GLOBAL', 'com.android.geto', 'label', 'key', 'valueOnLaunch', 'valueOnRevert')")
+            close()
+        }
+
+        helper.runMigrationsAndValidate(testDb, 8, true, Migration7To8())
+    }
+
     @Test
     @Throws(IOException::class)
     fun migrateAll() {