Add shortcut to logout secondary user

Fix cross profile intent filter database bug

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, 7) {
+class MyDbHelper(context: Context): SQLiteOpenHelper(context, "data", null, 8) {
     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(CP_INTENTS_TABLE)
+        db.execSQL(CPIF_TABLE)
     }
     override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
         if (oldVersion < 2) {
@@ -22,14 +22,8 @@ class MyDbHelper(context: Context): SQLiteOpenHelper(context, "data", null, 7) {
         if (oldVersion < 4) {
             db.execSQL(APP_GROUPS_TABLE)
         }
-        if (oldVersion < 5) {
-            db.execSQL(CP_INTENTS_TABLE)
-        }
-        if (oldVersion < 6) {
-            db.execSQL(UPGRADE_CP_INTENTS_TABLE)
-        }
-        if (oldVersion < 7) {
-            db.execSQL(RENAME_CP_COLUMN)
+        if (oldVersion < 8) {
+            db.execSQL(CPIF_TABLE)
         }
     }
     companion object {
@@ -43,11 +37,7 @@ class MyDbHelper(context: Context): SQLiteOpenHelper(context, "data", null, 7) {
         const val APP_GROUPS_TABLE = "CREATE TABLE app_groups(" +
                 "id INTEGER PRIMARY KEY AUTOINCREMENT," +
                 "name TEXT, apps TEXT)"
-        const val CP_INTENTS_TABLE = "CREATE TABLE cross_profile_intent_filters (" +
+        const val CPIF_TABLE = "CREATE TABLE cpif (" +
                 "action_str TEXT, category TEXT, mime_type TEXT, direction INTEGER, time INTEGER)"
-        const val UPGRADE_CP_INTENTS_TABLE = "ALTER TABLE cross_profile_intent_filters " +
-                "ADD COLUMN created_at INTEGER NOT NULL DEFAULT 0"
-        const val RENAME_CP_COLUMN = "ALTER TABLE cross_profile_intent_filters " +
-                "RENAME COLUMN created_at TO time"
     }
 }

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

@@ -1,6 +1,7 @@
 package com.bintianqi.owndroid
 
 import android.app.Activity
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import com.bintianqi.owndroid.feature.users.UserOperationType
@@ -28,12 +29,14 @@ class ShortcutsReceiverActivity : Activity() {
                             val state = dpm.getCameraDisabled(dar)
                             dpm.setCameraDisabled(dar, !state)
                             ShortcutUtils.setShortcut(context, sr, MyShortcut.DisableCamera, state)
+                            context.showOperationResultToast(true)
                         }
 
                         "MUTE" -> {
                             val state = dpm.isMasterVolumeMuted(dar)
                             dpm.setMasterVolumeMuted(dar, !state)
                             ShortcutUtils.setShortcut(context, sr, MyShortcut.Mute, state)
+                            context.showOperationResultToast(true)
                         }
 
                         "USER_RESTRICTION" -> {
@@ -48,6 +51,7 @@ class ShortcutsReceiverActivity : Activity() {
                             ShortcutUtils.updateUserRestrictionShortcut(
                                 context, sr, id, !state, false
                             )
+                            context.showOperationResultToast(true)
                         }
 
                         "USER_OPERATION" -> {
@@ -56,11 +60,18 @@ class ShortcutsReceiverActivity : Activity() {
                             val serial = intent.getIntExtra("serial", -1)
                             if (serial == -1) return@safeDpmCall
                             doUserOperationWithContext(context, ph.dpm, ph.dar, type, serial, false)
+                            context.showOperationResultToast(true)
+                        }
+
+                        "LOGOUT" -> {
+                            if (Build.VERSION.SDK_INT >= 28) {
+                                val result = dpm.logoutUser(dar)
+                                context.showOperationResultToast(result == 0)
+                            }
                         }
                     }
                 }
                 Log.d(TAG, "Received intent: $action")
-                showOperationResultToast(true)
             } else {
                 showOperationResultToast(false)
             }

app/src/main/java/com/bintianqi/owndroid/feature/users/UsersScreen.kt

@@ -144,7 +144,12 @@ fun UsersScreen(vm: UsersViewModel, onNavigateUp: () -> Unit, onNavigate: (Desti
     if (VERSION.SDK_INT >= 28 && dialog == 1) AlertDialog(
         title = { Text(stringResource(R.string.logout)) },
         text = {
-            Text(stringResource(R.string.info_logout))
+            Column {
+                Text(stringResource(R.string.info_logout))
+                TextButton({
+                    vm.requestPinLogoutShortcut()
+                }) { Text(stringResource(R.string.create_shortcut)) }
+            }
         },
         confirmButton = {
             TextButton({

app/src/main/java/com/bintianqi/owndroid/feature/users/UsersViewModel.kt

@@ -185,4 +185,9 @@ class UsersViewModel(
         val result = dpm.logoutUser(dar)
         if (result != 0) toastChannel.sendStatus(false)
     }
+
+    fun requestPinLogoutShortcut() {
+        val result = ShortcutUtils.requestPinLogoutShortcut(application, settingsRepo)
+        if (!result) toastChannel.sendStatus(false)
+    }
 }

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

@@ -11,13 +11,13 @@ class CrossProfileIntentFilterRepository(val dbHelper: MyDbHelper) {
         cv.put("mime_type", data.mimeType)
         cv.put("direction", data.direction)
         cv.put("time", System.currentTimeMillis())
-        dbHelper.writableDatabase.insert("cross_profile_intent_filters", null, cv)
+        dbHelper.writableDatabase.insert("cpif", null, cv)
     }
 
     fun getAllCrossProfileIntentFilters(): List<IntentFilterOptions> {
         val list = mutableListOf<IntentFilterOptions>()
         dbHelper.readableDatabase.rawQuery(
-            "SELECT * FROM cross_profile_intent_filters ORDER BY time DESC", null
+            "SELECT * FROM cpif ORDER BY time DESC", null
         ).use {
             while (it.moveToNext()) {
                 list += IntentFilterOptions(
@@ -29,6 +29,6 @@ class CrossProfileIntentFilterRepository(val dbHelper: MyDbHelper) {
     }
 
     fun deleteAllCrossProfileIntentFilters() {
-        dbHelper.writableDatabase.delete("cross_profile_intent_filters", null, null)
+        dbHelper.writableDatabase.delete("cpif", null, null)
     }
 }

app/src/main/java/com/bintianqi/owndroid/utils/ShortcutUtils.kt

@@ -136,6 +136,20 @@ object ShortcutUtils {
             context, shortcuts, context.getString(R.string.user_removed)
         )
     }
+
+    fun requestPinLogoutShortcut(context: Context, sr: SettingsRepository): Boolean {
+        val shortcut = ShortcutInfoCompat.Builder(context, "LOGOUT")
+            .setIcon(IconCompat.createWithResource(context, R.drawable.logout_fill0))
+            .setShortLabel(context.getText(R.string.logout))
+            .setIntent(
+                Intent(context, ShortcutsReceiverActivity::class.java)
+                    .setAction("com.bintianqi.owndroid.action.LOGOUT")
+                    .putExtra("key", sr.data.shortcut.key)
+            )
+            .build()
+        return ShortcutManagerCompat.requestPinShortcut(context, shortcut, null)
+    }
+
     fun setShortcutKey(sr: SettingsRepository) {
         if (sr.data.shortcut.key.isEmpty()) {
             sr.update {

app/src/main/res/values-zh-rCN/strings.xml

@@ -511,6 +511,7 @@
     <string name="user_not_exist">用户不存在</string>
     <string name="serial_number">序列号</string>
     <string name="logout">登出</string>
+    <string name="create_shortcut">创建快捷方式</string>
     <string name="start_in_background">在后台启动</string>
     <string name="user_operation_switch">切换</string>
     <string name="limit_reached">已达到上限</string>

app/src/main/res/values/strings.xml

@@ -547,6 +547,7 @@
     <string name="user_not_exist">User does not exist</string>
     <string name="serial_number">Serial number</string>
     <string name="logout">Logout</string>
+    <string name="create_shortcut">Create shortcut</string>
     <string name="start_in_background">Start in background</string>
     <string name="user_operation_switch">Switch</string>
     <string name="limit_reached">Limit reached</string>