simplify code of get file with MutableStateFlow

2026-03-23 19:15:58 +00:00 · 2024-05-25 19:53:03 +08:00
parent b77105602a
commit e21d91c1e4
9 changed files with 54 additions and 58 deletions
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
@@ -52,7 +52,6 @@ import androidx.navigation.compose.rememberNavController
 import com.bintianqi.owndroid.*
 import com.bintianqi.owndroid.R
 import com.bintianqi.owndroid.ui.*
-import kotlinx.coroutines.delay
 import java.io.IOException
 import java.io.InputStream
 import java.util.concurrent.Executors
@@ -263,9 +262,7 @@ private fun Home(navCtrl:NavHostController, pkgName: String, dialogStatus: Mutab
            SubPageItem(R.string.set_default_dialer,"",R.drawable.call_fill0){navCtrl.navigate("DefaultDialer")}
        }
        Spacer(Modifier.padding(vertical = 30.dp))
-        LaunchedEffect(Unit) {
-            fileUri = null
-        }
+        LaunchedEffect(Unit) { fileUriFlow.value = Uri.parse("") }
    }
 }

@@ -348,10 +345,10 @@ private fun PermissionManage(pkgName: String, navCtrl: NavHostController){
        PERMISSION_GRANT_STATE_GRANTED to stringResource(R.string.granted),
        PERMISSION_GRANT_STATE_DENIED to stringResource(R.string.denied)
    )
-    LaunchedEffect(Unit) {
-        while(true){
-            if(applySelectedPermission){inputPermission = selectedPermission; applySelectedPermission = false}
-            delay(100)
+    LaunchedEffect(applySelectedPermission.collectAsState()) {
+        if(applySelectedPermission.value) {
+            inputPermission = selectedPermission
+            applySelectedPermission.value = false
        }
    }
    LaunchedEffect(pkgName) {
@@ -794,6 +791,7 @@ private fun UninstallApp(pkgName: String){
 private fun InstallApp(){
    val context = LocalContext.current
    val focusMgr = LocalFocusManager.current
+    val selected = fileUriFlow.collectAsState().value != Uri.parse("")
    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())){
        Spacer(Modifier.padding(vertical = 10.dp))
        Text(text = stringResource(R.string.install_app), style = typography.headlineLarge)
@@ -810,13 +808,11 @@ private fun InstallApp(){
        ) {
            Text(stringResource(R.string.select_apk))
        }
-        var selected by remember{mutableStateOf(false)}
-        LaunchedEffect(selected){while(true){ delay(800); selected = fileUri!=null}}
        AnimatedVisibility(selected) {
            Spacer(Modifier.padding(vertical = 3.dp))
            Column(modifier = Modifier.fillMaxWidth()){
                Button(
-                    onClick = { uriToStream(context, fileUri){stream -> installPackage(context,stream)} },
+                    onClick = { uriToStream(context, fileUriFlow.value){stream -> installPackage(context,stream)} },
                    modifier = Modifier.fillMaxWidth()
                ) {
                    Text(stringResource(R.string.silent_install))
@@ -824,7 +820,7 @@ private fun InstallApp(){
                Button(
                    onClick = {
                        val intent = Intent(Intent.ACTION_INSTALL_PACKAGE)
-                        intent.setData(fileUri)
+                        intent.setData(fileUriFlow.value)
                        intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                        context.startActivity(intent)
                    },
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/DPM.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/DPM.kt
@@ -2,11 +2,11 @@ package com.bintianqi.owndroid.dpm

 import android.app.admin.DevicePolicyManager
 import android.content.Intent
-import android.net.Uri
 import androidx.activity.result.ActivityResultLauncher
+import kotlinx.coroutines.flow.MutableStateFlow

 var selectedPermission = ""
-var applySelectedPermission = false
+var applySelectedPermission = MutableStateFlow(false)
 lateinit var createManagedProfile: ActivityResultLauncher<Intent>
 lateinit var addDeviceAdmin: ActivityResultLauncher<Intent>

--- a/app/src/main/java/com/bintianqi/owndroid/dpm/ShizukuActivate.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/ShizukuActivate.kt
@@ -129,7 +129,7 @@ fun ShizukuActivate(){
                    coScope.launch{
                        outputText = service!!.execute(context.getString(R.string.dpm_activate_po_command))
                        outputTextScrollState.animateScrollTo(0, scrollAnim())
-                        delay(600)
+                        delay(500)
                        showProfileOwnerButton = !isProfileOwner(dpm)
                    }
                },
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
@@ -11,6 +11,7 @@ import android.app.admin.SystemUpdatePolicy.TYPE_POSTPONE
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Binder
 import android.os.Build.VERSION
 import android.os.UserManager
@@ -19,11 +20,14 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.*
+import androidx.compose.foundation.ScrollState
+import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.text.selection.SelectionContainer
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.*
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.MaterialTheme.typography
@@ -44,7 +48,6 @@ import androidx.navigation.compose.rememberNavController
 import com.bintianqi.owndroid.*
 import com.bintianqi.owndroid.R
 import com.bintianqi.owndroid.ui.*
-import kotlinx.coroutines.delay
 import java.util.Date

@Composable
@@ -150,7 +153,7 @@ private fun Home(navCtrl: NavHostController,scrollState: ScrollState){
        }
        SubPageItem(R.string.wipe_data,"",R.drawable.warning_fill0){navCtrl.navigate("WipeData")}
        Spacer(Modifier.padding(vertical = 30.dp))
-        LaunchedEffect(Unit){fileUri=null}
+        LaunchedEffect(Unit){ fileUriFlow.value = Uri.parse("") }
    }
 }

@@ -593,26 +596,23 @@ private fun CaCert(){
    val context = LocalContext.current
    val dpm = context.getSystemService(ComponentActivity.DEVICE_POLICY_SERVICE) as DevicePolicyManager
    val receiver = ComponentName(context,Receiver::class.java)
+    val uri by fileUriFlow.collectAsState()
    var exist by remember{mutableStateOf(false)}
-    var uriPath by remember{mutableStateOf("")}
-    var caCertByteArray = byteArrayOf()
-    val refresh = {
-        if(uriPath!=fileUri?.path){
-            if(caCertByteArray.isEmpty()){
-                uriToStream(context, fileUri){
-                    val array = it.readBytes()
-                    caCertByteArray = if(array.size<10000){
-                        array
-                    }else{
-                        byteArrayOf()
-                    }
+    val uriPath = uri.path ?: ""
+    var caCertByteArray by remember{ mutableStateOf(byteArrayOf()) }
+    LaunchedEffect(uri) {
+        if(uri != Uri.parse("")) {
+            uriToStream(context, uri){
+                val array = it.readBytes()
+                caCertByteArray = if(array.size<10000){
+                    array
+                }else{
+                    byteArrayOf()
                }
-                exist = dpm.hasCaCertInstalled(receiver, caCertByteArray)
            }
-            uriPath = fileUri?.path?:""
+            exist = dpm.hasCaCertInstalled(receiver, caCertByteArray)
        }
    }
-    LaunchedEffect(exist){ while(true){ refresh();delay(500) } }
    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())){
        Spacer(Modifier.padding(vertical = 10.dp))
        Text(text = stringResource(R.string.ca_cert), style = typography.headlineLarge)
@@ -642,7 +642,7 @@ private fun CaCert(){
                    onClick = {
                        val result = dpm.installCaCert(receiver, caCertByteArray)
                        Toast.makeText(context, if(result){R.string.success}else{R.string.fail}, Toast.LENGTH_SHORT).show()
-                        refresh()
+                        exist = dpm.hasCaCertInstalled(receiver, caCertByteArray)
                    },
                    modifier = Modifier.fillMaxWidth(0.49F)
                ) {
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt
@@ -6,6 +6,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
+import android.net.Uri
 import android.os.Binder
 import android.os.Build.VERSION
 import android.os.Process
@@ -119,9 +120,7 @@ private fun Home(navCtrl: NavHostController,scrollState: ScrollState){
            SubPageItem(R.string.affiliation_id,"",R.drawable.id_card_fill0){navCtrl.navigate("AffiliationID")}
        }
        Spacer(Modifier.padding(vertical = 30.dp))
-        LaunchedEffect(Unit) {
-            fileUri = null
-        }
+        LaunchedEffect(Unit) { fileUriFlow.value = Uri.parse("") }
    }
 }

@@ -495,7 +494,7 @@ private fun UserIcon(){
    val dpm = context.getSystemService(ComponentActivity.DEVICE_POLICY_SERVICE) as DevicePolicyManager
    val receiver = ComponentName(context,Receiver::class.java)
    var getContent by remember{mutableStateOf(false)}
-    var canApply by remember{mutableStateOf(false)}
+    val canApply = fileUriFlow.collectAsState().value != Uri.parse("")
    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())){
        Spacer(Modifier.padding(vertical = 10.dp))
        Text(text = stringResource(R.string.change_user_icon), style = typography.headlineLarge)
@@ -515,11 +514,10 @@ private fun UserIcon(){
        ) {
            Text(stringResource(R.string.select_picture))
        }
-        LaunchedEffect(Unit){ delay(600); canApply = fileUri!=null }
        AnimatedVisibility(canApply) {
            Button(
                onClick = {
-                    uriToStream(context, fileUri){stream ->
+                    uriToStream(context, fileUriFlow.value){stream ->
                        val bitmap = BitmapFactory.decodeStream(stream)
                        dpm.setUserIcon(receiver,bitmap)
                        Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()