Improve the design of Cross Profile Intent Filter (#299, #301)

Update dependencies

Co-authored-by: Araaf Royall ❂ <87515236+AraafRoyall@users.noreply.github.com>

Author: BinTianqi

app/src/main/java/com/bintianqi/owndroid/MyDbHelper.kt

@@ -4,13 +4,13 @@ import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
 
-class MyDbHelper(context: Context): SQLiteOpenHelper(context, "data", null, 8) {
+class MyDbHelper(context: Context): SQLiteOpenHelper(context, "data", null, 9) {
     override fun onCreate(db: SQLiteDatabase) {
         db.execSQL(DHIZUKU_CLIENTS_TABLE)
         db.execSQL(SECURITY_LOGS_TABLE)
         db.execSQL(NETWORK_LOGS_TABLE)
         db.execSQL(APP_GROUPS_TABLE)
-        db.execSQL(CPIF_TABLE)
+        db.execSQL(CPIF2_TABLE)
     }
     override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
         if (oldVersion < 2) {
@@ -25,6 +25,10 @@ class MyDbHelper(context: Context): SQLiteOpenHelper(context, "data", null, 8) {
         if (oldVersion < 8) {
             db.execSQL(CPIF_TABLE)
         }
+        if (oldVersion < 9) {
+            db.execSQL(DELETE_CPIF)
+            db.execSQL(CPIF2_TABLE)
+        }
     }
     companion object {
         const val DHIZUKU_CLIENTS_TABLE = "CREATE TABLE dhizuku_clients (uid INTEGER PRIMARY KEY," +
@@ -39,5 +43,9 @@ class MyDbHelper(context: Context): SQLiteOpenHelper(context, "data", null, 8) {
                 "name TEXT, apps TEXT)"
         const val CPIF_TABLE = "CREATE TABLE cpif (" +
                 "action_str TEXT, category TEXT, mime_type TEXT, direction INTEGER, time INTEGER)"
+        const val DELETE_CPIF = "DROP TABLE cpif"
+        const val CPIF2_TABLE = "CREATE TABLE cpif2 (id INTEGER PRIMARY KEY AUTOINCREMENT," +
+                "action_str TEXT, category TEXT, mime_type TEXT, direction INTEGER," +
+                "created_at INTEGER)"
     }
 }

app/src/main/java/com/bintianqi/owndroid/feature/work_profile/CrossProfileIntentFilterModel.kt

@@ -10,6 +10,11 @@ data class IntentFilterOptions(
     val direction: Int // 1: private to work, 2: work to private, 3: both
 )
 
+/** Represents a row in database table `cpif` */
+class IntentFilterEntry(
+    val id: Int, val options: IntentFilterOptions, val time: Long
+)
+
 val directionTextMap = mapOf(
     1 to R.string.personal_to_work,
     2 to R.string.work_to_personal,

app/src/main/java/com/bintianqi/owndroid/feature/work_profile/CrossProfileIntentFilterRepository.kt

@@ -10,25 +10,30 @@ class CrossProfileIntentFilterRepository(val dbHelper: MyDbHelper) {
         cv.put("category", data.category)
         cv.put("mime_type", data.mimeType)
         cv.put("direction", data.direction)
-        cv.put("time", System.currentTimeMillis())
-        dbHelper.writableDatabase.insert("cpif", null, cv)
+        cv.put("created_at", System.currentTimeMillis())
+        dbHelper.writableDatabase.insert("cpif2", null, cv)
     }
 
-    fun getAllCrossProfileIntentFilters(): List<IntentFilterOptions> {
-        val list = mutableListOf<IntentFilterOptions>()
+    fun getAllFilters(): List<IntentFilterEntry> {
+        val list = mutableListOf<IntentFilterEntry>()
         dbHelper.readableDatabase.rawQuery(
-            "SELECT * FROM cpif ORDER BY time DESC", null
+            "SELECT * FROM cpif2 ORDER BY created_at DESC", null
         ).use {
             while (it.moveToNext()) {
-                list += IntentFilterOptions(
-                    it.getString(0), it.getString(1), it.getString(2), it.getInt(3)
+                val options = IntentFilterOptions(
+                    it.getString(1), it.getString(2), it.getString(3), it.getInt(4)
                 )
+                list += IntentFilterEntry(it.getInt(0), options, it.getLong(5))
             }
         }
         return list
     }
 
+    fun deleteById(id: Int) {
+        dbHelper.writableDatabase.delete("cpif2", "id = ?", arrayOf("$id"))
+    }
+
     fun deleteAllCrossProfileIntentFilters() {
-        dbHelper.writableDatabase.delete("cpif", null, null)
+        dbHelper.writableDatabase.delete("cpif2", null, null)
     }
 }