Set organization name and organization id in dialog

ManageSpaceActivity: use dialog

app/src/main/AndroidManifest.xml

@@ -50,7 +50,7 @@
         <activity
             android:name=".ManageSpaceActivity"
             android:windowSoftInputMode="adjustResize|stateHidden"
-            android:theme="@style/Theme.OwnDroid">
+            android:theme="@style/Theme.Transparent">
         </activity>
         <activity
             android:name=".AutomationActivity"

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

@@ -1,83 +1,54 @@
 package com.bintianqi.owndroid
 
-import android.content.Context
 import android.os.Bundle
-import android.widget.Toast
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
+import androidx.compose.material3.TextButton
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
 import com.bintianqi.owndroid.ui.theme.OwnDroidTheme
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
 class ManageSpaceActivity: FragmentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
         WindowCompat.setDecorFitsSystemWindows(window, false)
         super.onCreate(savedInstanceState)
-        val sharedPref = applicationContext.getSharedPreferences("data", Context.MODE_PRIVATE)
+        val sharedPref = applicationContext.getSharedPreferences("data", MODE_PRIVATE)
         val materialYou = sharedPref.getBoolean("material_you", true)
         val blackTheme = sharedPref.getBoolean("black_theme", false)
+        val protected = sharedPref.getBoolean("protect_storage", false)
         setContent {
             OwnDroidTheme(materialYou, blackTheme) {
-                ManageSpace()
-            }
-        }
-    }
-
-    @Composable
-    fun ManageSpace() {
-        Column(
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.CenterHorizontally,
-            modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)
-        ) {
-            val sharedPref = applicationContext.getSharedPreferences("data", Context.MODE_PRIVATE)
-            val protected = sharedPref.getBoolean("protect_storage", false)
-            if(protected){
-                Text(
-                    text = stringResource(R.string.storage_is_protected),
-                    color = MaterialTheme.colorScheme.onBackground,
-                    style = MaterialTheme.typography.titleMedium
-                )
-                Text(
-                    text = stringResource(R.string.you_cant_clear_storage),
-                    color = MaterialTheme.colorScheme.onBackground
-                )
-            }
-            Button(
-                onClick = {
-                    lifecycleScope.launch {
-                        sharedPref.edit().clear().apply()
-                        delay(2000)
-                        finishAndRemoveTask()
-                    }
-                    Toast.makeText(applicationContext, R.string.clear_storage_success, Toast.LENGTH_SHORT).show()
+                AlertDialog(
+                    title = {
+                        Text(stringResource(R.string.clear_storage))
                     },
-                enabled = !protected,
-                colors = ButtonDefaults.buttonColors(
-                    contentColor = MaterialTheme.colorScheme.onError,
-                    containerColor = MaterialTheme.colorScheme.error
-                ),
-                modifier = Modifier.padding(top = 10.dp)
+                    text = {
+                        if(protected) Text(stringResource(R.string.storage_is_protected))
+                    },
+                    onDismissRequest = { finish() },
+                    dismissButton = {
+                        if(!protected) TextButton(onClick = { finish() }) {
+                            Text(stringResource(R.string.cancel))
+                        }
+                    },
+                    confirmButton = {
+                        TextButton(
+                            onClick = {
+                                if(!protected) {
+                                    applicationContext.filesDir.deleteRecursively()
+                                    sharedPref.edit().clear().apply()
+                                }
+                                finish()
+                            }
                         ) {
-                Text(text = stringResource(R.string.clear_storage))
+                            Text(stringResource(if(protected) R.string.cancel else R.string.confirm))
+                        }
+                    }
+                )
             }
         }
     }

app/src/main/java/com/bintianqi/owndroid/dpm/Password.kt

@@ -214,6 +214,7 @@ private fun Home(navCtrl:NavHostController, scrollState: ScrollState) {
                         onValueChange = { input = it },
                         keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done),
                         keyboardActions = KeyboardActions(onDone = { focusMgr.clearFocus() }),
+                        textStyle = typography.bodyLarge,
                         modifier = Modifier.fillMaxWidth().padding(bottom = 5.dp)
                     )
                     when(dialog) {

app/src/main/java/com/bintianqi/owndroid/dpm/Permissions.kt

@@ -75,8 +75,6 @@ fun DpmPermissions(navCtrl:NavHostController) {
             composable(route = "ProfileOwner") { ProfileOwner() }
             composable(route = "DeviceOwner") { DeviceOwner() }
             composable(route = "DeviceInfo") { DeviceInfo() }
-            composable(route = "OrgID") { OrgID() }
-            composable(route = "OrgName") { OrgName() }
             composable(route = "DisableAccountManagement") { DisableAccountManagement() }
             composable(route = "LockScreenInfo") { LockScreenInfo() }
             composable(route = "SupportMsg") { SupportMsg() }
@@ -95,7 +93,7 @@ private fun Home(localNavCtrl:NavHostController,listScrollState:ScrollState) {
     val deviceAdmin = context.isDeviceAdmin
     val deviceOwner = context.isDeviceOwner
     val profileOwner = context.isProfileOwner
-    var enrollmentIdDialog by remember { mutableStateOf(false) }
+    var dialog by remember { mutableIntStateOf(0) }
     val enrollmentSpecificId = if(VERSION.SDK_INT >= 31 && (deviceOwner || profileOwner)) dpm.enrollmentSpecificId else ""
     Column(modifier = Modifier.fillMaxSize().verticalScroll(listScrollState)) {
         Text(
@@ -131,13 +129,13 @@ private fun Home(localNavCtrl:NavHostController,listScrollState:ScrollState) {
         SubPageItem(R.string.shizuku,"") { localNavCtrl.navigate("Shizuku") }
         SubPageItem(R.string.device_info, "", R.drawable.perm_device_information_fill0) { localNavCtrl.navigate("DeviceInfo") }
         if((VERSION.SDK_INT >= 26 && deviceOwner) || (VERSION.SDK_INT>=24 && profileOwner)) {
-            SubPageItem(R.string.org_name, "", R.drawable.corporate_fare_fill0) { localNavCtrl.navigate("OrgName") }
+            SubPageItem(R.string.org_name, "", R.drawable.corporate_fare_fill0) { dialog = 2 }
         }
         if(VERSION.SDK_INT >= 31 && (profileOwner || deviceOwner)) {
-            SubPageItem(R.string.org_id, "", R.drawable.corporate_fare_fill0) { localNavCtrl.navigate("OrgID") }
+            SubPageItem(R.string.org_id, "", R.drawable.corporate_fare_fill0) { dialog = 3 }
         }
         if(enrollmentSpecificId != "") {
-            SubPageItem(R.string.enrollment_specific_id, "", R.drawable.id_card_fill0) { enrollmentIdDialog = true }
+            SubPageItem(R.string.enrollment_specific_id, "", R.drawable.id_card_fill0) { dialog = 1 }
         }
         if(deviceOwner || profileOwner) {
             SubPageItem(R.string.disable_account_management, "", R.drawable.account_circle_fill0) { localNavCtrl.navigate("DisableAccountManagement") }
@@ -153,28 +151,77 @@ private fun Home(localNavCtrl:NavHostController,listScrollState:ScrollState) {
         }
         Spacer(Modifier.padding(vertical = 30.dp))
     }
-    if(enrollmentIdDialog) AlertDialog(
-        title = { Text(stringResource(R.string.enrollment_specific_id)) },
+    if(dialog != 0) {
+        var input by remember { mutableStateOf("") }
+        AlertDialog(
+            title = {
+                Text(stringResource(
+                    when(dialog){
+                        1 -> R.string.enrollment_specific_id
+                        2 -> R.string.org_name
+                        3 -> R.string.org_id
+                        else -> R.string.permission
+                    }
+                ))
+            },
             text = {
-            val esid = dpm.enrollmentSpecificId
+                val focusMgr = LocalFocusManager.current
+                LaunchedEffect(Unit) {
+                    if(dialog == 1) input = dpm.enrollmentSpecificId
+                }
                 OutlinedTextField(
-                value = esid,
-                onValueChange = {}, readOnly = true, modifier = Modifier.fillMaxWidth(),
+                    value = input,
+                    onValueChange = { input = it }, readOnly = dialog == 1, modifier = Modifier.fillMaxWidth(),
+                    label = {
+                        Text(stringResource(
+                            when(dialog){
+                                1 -> R.string.enrollment_specific_id
+                                2 -> R.string.org_name
+                                3 -> R.string.org_id
+                                else -> R.string.permission
+                            }
+                        ))
+                    },
                     trailingIcon = {
-                    IconButton(onClick = { writeClipBoard(context, esid) }) {
+                        if(dialog == 1) IconButton(onClick = { writeClipBoard(context, input) }) {
                             Icon(painter = painterResource(R.drawable.content_copy_fill0), contentDescription = stringResource(R.string.copy))
                         }
-                }
+                    },
+                    supportingText = {
+                        if(dialog == 3) Text(stringResource(R.string.length_6_to_64))
+                    },
+                    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
+                    keyboardActions = KeyboardActions { focusMgr.clearFocus() },
+                    textStyle = typography.bodyLarge
                 )
             },
-        onDismissRequest = { enrollmentIdDialog = false },
+            onDismissRequest = { dialog = 0 },
+            dismissButton = {
+                TextButton(
+                    onClick = { dialog = 0 }
+                ) {
+                    Text(stringResource(R.string.cancel))
+                }
+            },
             confirmButton = {
-            TextButton(onClick = { enrollmentIdDialog = false }) {
+                TextButton(
+                    onClick = {
+                        try {
+                            if(dialog == 2) dpm.setOrganizationName(receiver, input)
+                            if(dialog == 3) dpm.setOrganizationId(input)
+                            dialog = 0
+                        } catch(_: IllegalStateException) {
+                            Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
+                        }
+                    },
+                    enabled = (dialog == 3 && input.length in 6..64) || dialog != 3
+                ) {
                     Text(stringResource(R.string.confirm))
                 }
             }
         )
     }
+}
 
 private fun toggleDhizukuMode(status: Boolean, context: Context) {
     val sharedPref = context.getSharedPreferences("data", Context.MODE_PRIVATE)
@@ -481,78 +528,6 @@ fun DeviceInfo() {
     }
 }
 
-@SuppressLint("NewApi")
-@Composable
-private fun OrgID() {
-    val context = LocalContext.current
-    val dpm = context.getDPM()
-    val focusMgr = LocalFocusManager.current
-    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())) {
-        var orgId by remember { mutableStateOf("") }
-        Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.org_id), style = typography.headlineLarge)
-        Spacer(Modifier.padding(vertical = 5.dp))
-        OutlinedTextField(
-            value = orgId, onValueChange = { orgId=it },
-            label = { Text(stringResource(R.string.org_id)) },
-            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Ascii, imeAction = ImeAction.Done),
-            keyboardActions = KeyboardActions(onDone = {focusMgr.clearFocus() }),
-            modifier = Modifier.fillMaxWidth()
-        )
-        Spacer(Modifier.padding(vertical = 2.dp))
-        AnimatedVisibility(orgId.length !in 6..64) {
-            Text(text = stringResource(R.string.length_6_to_64))
-        }
-        Spacer(Modifier.padding(vertical = 5.dp))
-        Button(
-            onClick = {
-                try {
-                    dpm.setOrganizationId(orgId)
-                    Toast.makeText(context, R.string.success,Toast.LENGTH_SHORT).show()
-                } catch(e: IllegalStateException) {
-                    Toast.makeText(context, R.string.failed,Toast.LENGTH_SHORT).show()
-                }
-            },
-            enabled = orgId.length in 6..64,
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            Text(stringResource(R.string.apply))
-        }
-    }
-}
-
-@SuppressLint("NewApi")
-@Composable
-private fun OrgName() {
-    val context = LocalContext.current
-    val dpm = context.getDPM()
-    val receiver = context.getReceiver()
-    val focusMgr = LocalFocusManager.current
-    Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState()).padding(horizontal = 8.dp)) {
-        var orgName by remember { mutableStateOf(try{dpm.getOrganizationName(receiver).toString() }catch(e:SecurityException) {""}) }
-        Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.org_name), style = typography.headlineLarge)
-        Spacer(Modifier.padding(vertical = 5.dp))
-        OutlinedTextField(
-            value = orgName, onValueChange = { orgName = it }, modifier = Modifier.fillMaxWidth().padding(vertical = 3.dp),
-            label = { Text(stringResource(R.string.org_name)) },
-            keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
-            keyboardActions = KeyboardActions(onDone = {focusMgr.clearFocus() })
-        )
-        Spacer(Modifier.padding(vertical = 5.dp))
-        Button(
-            onClick = {
-                focusMgr.clearFocus()
-                dpm.setOrganizationName(receiver,orgName)
-                Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
-            },
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            Text(stringResource(R.string.apply))
-        }
-    }
-}
-
 @SuppressLint("NewApi")
 @Composable
 private fun SupportMsg() {

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

@@ -554,10 +554,8 @@
     <string name="auth_with_bio">OwnDroid\'u biyometri ile doğrula</string>
     <string name="lock_in_background">Arka plana geçince kilitle</string>
     <string name="protect_storage">Depolamayı koru</string>
-    <string name="storage_is_protected">Depolama korunuyor</string>
-    <string name="you_cant_clear_storage">OwnDroid\'un depolamasını temizleyemezsiniz</string>
+    <string name="storage_is_protected">Depolama korunuyor</string> <!--TODO-->
     <string name="clear_storage">Depolamayı temizle</string>
-    <string name="clear_storage_success">Depolama başarıyla temizlendi\nUygulama kapanacak</string>
 
     <string name="automation_api">Automation API</string> <!--TODO-->
     <string name="automation_debug">Debug mode</string> <!--TODO-->

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

@@ -546,10 +546,8 @@
     <string name="auth_with_bio">使用生物识别进行验证</string>
     <string name="lock_in_background">处于后台时锁定</string>
     <string name="protect_storage">保护存储空间</string>
-    <string name="storage_is_protected">存储空间受到保护</string>
-    <string name="you_cant_clear_storage">你不能清除OwnDroid的存储空间</string>
+    <string name="storage_is_protected">存储空间受到保护，你不能清除OwnDroid的存储空间</string>
     <string name="clear_storage">清除存储空间</string>
-    <string name="clear_storage_success">清除存储空间成功\n应用即将退出</string>
 
     <string name="automation_api">自动化API</string>
     <string name="automation_debug">调试模式</string>

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

@@ -559,10 +559,8 @@
     <string name="auth_with_bio">Authenticate OwnDroid with biometrics</string>
     <string name="lock_in_background">Lock when switch to background</string>
     <string name="protect_storage">Protect storage</string>
-    <string name="storage_is_protected">Storage is protected</string>
-    <string name="you_cant_clear_storage">You can\'t clear storage of OwnDroid</string>
+    <string name="storage_is_protected">Storage is protected, you can\'t clear storage of OwnDroid</string>
     <string name="clear_storage">Clear storage</string>
-    <string name="clear_storage_success">Clear storage success\nApplication will exit</string>
 
     <string name="automation_api">Automation API</string>
     <string name="automation_debug">Debug mode</string>