fix context problems

app/src/main/AndroidManifest.xml

@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.MANAGE_DEVICE_POLICY_WIPE_DATA"/>
     <uses-permission android:name="android.permission.MANAGE_DEVICE_POLICY_ACROSS_USERS"/>
     <uses-permission android:name="android.permission.MANAGE_DEVICE_POLICY_RESET_PASSWORD"/>
@@ -32,8 +31,6 @@
                 <action android:name="android.app.action.MANAGED_PROFILE_PROVISIONED"/>
                 <action android:name="android.app.action.PROFILE_PROVISIONING_COMPLETE"/>
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.INFO"/>
-                <category android:name="android.intent.category.HOME"/>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/com/binbin/androidowner/ApplicationManage.kt

@@ -12,6 +12,7 @@ import android.net.Uri
 import android.os.Build.VERSION
 import android.util.Log
 import android.widget.Toast
+import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -33,6 +34,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat.startActivity
@@ -41,7 +43,10 @@ import java.io.InputStream
 
 
 @Composable
-fun ApplicationManage(myDpm:DevicePolicyManager, myComponent:ComponentName,myContext:Context){
+fun ApplicationManage(){
+    val myContext = LocalContext.current
+    val myDpm = myContext.getSystemService(ComponentActivity.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    val myComponent = ComponentName(myContext,MyDeviceAdminReceiver::class.java)
     var pkgName by remember { mutableStateOf("") }
     Column(
         modifier = Modifier

app/src/main/java/com/binbin/androidowner/DeviceControl.kt

@@ -2,9 +2,9 @@ package com.binbin.androidowner
 
 import android.app.admin.DevicePolicyManager
 import android.content.ComponentName
-import android.content.Context
 import android.os.Build.VERSION
 import android.widget.Toast
+import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -28,13 +28,17 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 
 @Composable
-fun DeviceControl(myDpm: DevicePolicyManager, myComponent: ComponentName,myContext: Context){
+fun DeviceControl(){
+    val myContext = LocalContext.current
+    val myDpm = myContext.getSystemService(ComponentActivity.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    val myComponent = ComponentName(myContext,MyDeviceAdminReceiver::class.java)
     Column(
         modifier = Modifier
             .verticalScroll(rememberScrollState())

app/src/main/java/com/binbin/androidowner/MainActivity.kt

@@ -15,7 +15,9 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -33,6 +35,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -47,14 +50,12 @@ import androidx.navigation.compose.rememberNavController
 import com.binbin.androidowner.ui.theme.AndroidOwnerTheme
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 
+@ExperimentalMaterial3Api
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
         super.onCreate(savedInstanceState)
-        val context = applicationContext
-        val dpm = context.getSystemService(DEVICE_POLICY_SERVICE) as DevicePolicyManager
-        val adminComponent = ComponentName(context,MyDeviceAdminReceiver::class.java)
         setContent {
             val sysUiCtrl = rememberSystemUiController()
             val useDarkIcon = !isSystemInDarkTheme()
@@ -63,16 +64,15 @@ class MainActivity : ComponentActivity() {
                     sysUiCtrl.setNavigationBarColor(Color.Transparent,useDarkIcon)
                     sysUiCtrl.setStatusBarColor(Color.Transparent,useDarkIcon)
                 }
-                MyScaffold(dpm,adminComponent,context)
+                MyScaffold()
             }
         }
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
-@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@ExperimentalMaterial3Api
 @Composable
-fun MyScaffold(mainDpm:DevicePolicyManager, mainComponent:ComponentName, mainContext:Context){
+fun MyScaffold(){
     val focusMgr = LocalFocusManager.current
     val navCtrl = rememberNavController()
     val backStackEntry by navCtrl.currentBackStackEntryAsState()
@@ -83,7 +83,8 @@ fun MyScaffold(mainDpm:DevicePolicyManager, mainComponent:ComponentName, mainCon
         "UserManage" to R.string.user_manage,
         "ApplicationManage" to R.string.app_manage,
         "UserRestriction" to R.string.user_restrict,
-        "Password" to R.string.password
+        "Password" to R.string.password,
+        "AppSetting" to R.string.setting
     )
     val topBarName = topBarNameMap[backStackEntry?.destination?.route]?: R.string.app_name
     Scaffold(
@@ -128,24 +129,28 @@ fun MyScaffold(mainDpm:DevicePolicyManager, mainComponent:ComponentName, mainCon
                 .padding(top = it.calculateTopPadding())
                 .imePadding()
         ){
-            composable(route = "HomePage", content = { HomePage(navCtrl,mainDpm,mainComponent)})
-            composable(route = "DeviceControl", content = { DeviceControl(mainDpm,mainComponent,mainContext)})
-            composable(route = "Permissions", content = { DpmPermissions(mainDpm,mainComponent,mainContext,navCtrl)})
-            composable(route = "ApplicationManage", content = { ApplicationManage(mainDpm,mainComponent,mainContext)})
-            composable(route = "UserRestriction", content = { UserRestriction(mainDpm,mainComponent,mainContext)})
-            composable(route = "UserManage", content = { UserManage(mainDpm,mainComponent,mainContext)})
-            composable(route = "Password", content = { Password(mainDpm,mainComponent,mainContext)})
+            composable(route = "HomePage", content = { HomePage(navCtrl)})
+            composable(route = "DeviceControl", content = { DeviceControl()})
+            composable(route = "Permissions", content = { DpmPermissions(navCtrl)})
+            composable(route = "ApplicationManage", content = { ApplicationManage()})
+            composable(route = "UserRestriction", content = { UserRestriction()})
+            composable(route = "UserManage", content = { UserManage()})
+            composable(route = "Password", content = { Password()})
+            composable(route = "AppSetting", content = { AppSetting()})
         }
     }
 }
 
 @Composable
-fun HomePage(navCtrl:NavHostController,myDpm:DevicePolicyManager,myComponent:ComponentName){
+fun HomePage(navCtrl:NavHostController){
+    val myContext = LocalContext.current
+    val myDpm = myContext.getSystemService(ComponentActivity.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    val myComponent = ComponentName(myContext,MyDeviceAdminReceiver::class.java)
     val isda = myDpm.isAdminActive(myComponent)
     val isdo = myDpm.isDeviceOwnerApp("com.binbin.androidowner")
     val activateType = if(isDeviceOwner(myDpm)){"Device Owner"}else if(isProfileOwner(myDpm)){"Profile Owner"}else if(isda){"Device Admin"}else{""}
     val isActivated = if(isdo||isda){"已激活"}else{"未激活"}
-    Column {
+    Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
         Row(
             modifier = Modifier
                 .fillMaxWidth()
@@ -185,6 +190,7 @@ fun HomePage(navCtrl:NavHostController,myDpm:DevicePolicyManager,myComponent:Com
         HomePageItem(R.string.user_restrict, R.drawable.manage_accounts_fill0, R.string.user_restrict_desc, "UserRestriction", navCtrl)
         HomePageItem(R.string.user_manage,R.drawable.account_circle_fill0,R.string.user_manage_desc,"UserManage",navCtrl)
         HomePageItem(R.string.password, R.drawable.password_fill0,R.string.security_desc, "Password",navCtrl)
+        HomePageItem(R.string.setting, R.drawable.info_fill0, R.string.setting_desc, "AppSetting",navCtrl)
     }
 }
 

app/src/main/java/com/binbin/androidowner/Password.kt

@@ -4,9 +4,9 @@ import android.app.KeyguardManager
 import android.app.admin.DevicePolicyManager
 import android.content.ComponentName
 import android.content.Context
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Build.VERSION
 import android.widget.Toast
+import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -38,6 +38,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusManager
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
@@ -46,7 +47,10 @@ import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat.startActivity
 
 @Composable
-fun Password(myDpm:DevicePolicyManager,myComponent:ComponentName,myContext:Context){
+fun Password(){
+    val myContext = LocalContext.current
+    val myDpm = myContext.getSystemService(ComponentActivity.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    val myComponent = ComponentName(myContext,MyDeviceAdminReceiver::class.java)
     var newPwd by remember{ mutableStateOf("") }
     var confirmed by remember{ mutableStateOf(false) }
     val focusMgr = LocalFocusManager.current
@@ -151,7 +155,7 @@ fun Password(myDpm:DevicePolicyManager,myComponent:ComponentName,myContext:Conte
                         }else{ Toast.makeText(myContext, "需要4位数字或字母", Toast.LENGTH_SHORT).show() }
                     },
                     modifier = Modifier.padding(end = 10.dp),
-                    enabled = isDeviceOwner(myDpm)|| isProfileOwner(myDpm)
+                    enabled = isDeviceOwner(myDpm) || isProfileOwner(myDpm) || myDpm.isAdminActive(myComponent)
                 ) {
                     Text("确认密码")
                 }
@@ -163,7 +167,6 @@ fun Password(myDpm:DevicePolicyManager,myComponent:ComponentName,myContext:Conte
                             }else{ Toast.makeText(myContext, "设置失败", Toast.LENGTH_SHORT).show() }
                             confirmed=false
                         },
-                        enabled = confirmed,
                         colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error, contentColor = MaterialTheme.colorScheme.onError)
                     ) {
                         Text("设置密码")
@@ -176,6 +179,7 @@ fun Password(myDpm:DevicePolicyManager,myComponent:ComponentName,myContext:Conte
                             }else{ Toast.makeText(myContext, "设置失败", Toast.LENGTH_SHORT).show() }
                             confirmed=false
                         },
+                        enabled = confirmed,
                         colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.error, contentColor = MaterialTheme.colorScheme.onError)
                     ) {
                         Text("设置密码")
@@ -234,7 +238,7 @@ fun Password(myDpm:DevicePolicyManager,myComponent:ComponentName,myContext:Conte
                 DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC to "数字字母各至少一个",
                 DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK to "生物识别（弱）",
                 DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX to "复杂数字（无连续性）",
-                DevicePolicyManager.PASSWORD_QUALITY_COMPLEX to "自定义",
+                DevicePolicyManager.PASSWORD_QUALITY_COMPLEX to "自定义（暂不支持）",
             ).toList()
             var selectedItem by remember{ mutableIntStateOf(passwordQuality[0].first) }
             if(isDeviceOwner(myDpm) || isProfileOwner(myDpm)){
@@ -329,7 +333,6 @@ fun activateToken(myContext: Context){
     val ACTIVATE_TOKEN_PROMPT = "在这里激活密码重置令牌"
     val keyguardManager = myContext.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
     val confirmIntent = keyguardManager.createConfirmDeviceCredentialIntent(null, ACTIVATE_TOKEN_PROMPT)
-    confirmIntent.setFlags(FLAG_ACTIVITY_NEW_TASK)
     if (confirmIntent != null) {
         startActivity(myContext,confirmIntent, null)
     } else {

app/src/main/java/com/binbin/androidowner/Permissions.kt

@@ -4,9 +4,9 @@ import android.app.admin.DevicePolicyManager
 import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
-import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.os.Build.VERSION
 import android.widget.Toast
+import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -30,6 +30,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusManager
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
@@ -40,10 +41,12 @@ import androidx.navigation.NavHostController
 
 
 @Composable
-fun DpmPermissions(myDpm: DevicePolicyManager, myComponent: ComponentName, myContext:Context,navCtrl:NavHostController){
+fun DpmPermissions(navCtrl:NavHostController){
     //da:DeviceAdmin do:DeviceOwner
+    val myContext = LocalContext.current
+    val myDpm = myContext.getSystemService(ComponentActivity.DEVICE_POLICY_SERVICE) as DevicePolicyManager
+    val myComponent = ComponentName(myContext,MyDeviceAdminReceiver::class.java)
     val isda = myDpm.isAdminActive(myComponent)
-    val isdo = myDpm.isDeviceOwnerApp("com.binbin.androidowner")
     val focusManager = LocalFocusManager.current
     Column(
         modifier = Modifier.verticalScroll(rememberScrollState()),
@@ -139,9 +142,9 @@ fun DpmPermissions(myDpm: DevicePolicyManager, myComponent: ComponentName, myCon
         ) {
             Column {
                 Text(text = "Device Owner", style = MaterialTheme.typography.titleLarge)
-                Text(if(isdo){"已激活"}else{"未激活"})
+                Text(if(isDeviceOwner(myDpm)){"已激活"}else{"未激活"})
             }
-            if(isdo){
+            if(isDeviceOwner(myDpm)){
                 Button(
                     onClick = {
                         myDpm.clearDeviceOwnerApp("com.binbin.androidowner")
@@ -156,14 +159,7 @@ fun DpmPermissions(myDpm: DevicePolicyManager, myComponent: ComponentName, myCon
                 }
             }
         }
-        if(isDeviceOwner(myDpm)|| isProfileOwner(myDpm)||myDpm.isAdminActive(myComponent)){
-            Text(
-                text = "注意！在这里撤销权限不会清除配置。比如：被停用的应用会保持停用状态",
-                color = MaterialTheme.colorScheme.onErrorContainer,
-                modifier = sections(MaterialTheme.colorScheme.errorContainer)
-            )
-        }
-        if(!isdo&&!isProfileOwner(myDpm)){
+        if(!isDeviceOwner(myDpm)&&!isProfileOwner(myDpm)){
             Column(
                 modifier = sections(MaterialTheme.colorScheme.tertiaryContainer),
                 horizontalAlignment = Alignment.Start
@@ -178,6 +174,13 @@ fun DpmPermissions(myDpm: DevicePolicyManager, myComponent: ComponentName, myCon
                 }
             }
         }
+        if(isDeviceOwner(myDpm)|| isProfileOwner(myDpm)||myDpm.isAdminActive(myComponent)){
+            Text(
+                text = "注意！在这里撤销权限不会清除配置。比如：被停用的应用会保持停用状态",
+                color = MaterialTheme.colorScheme.onErrorContainer,
+                modifier = sections(MaterialTheme.colorScheme.errorContainer)
+            )
+        }
         if(VERSION.SDK_INT>=30){
             Column(
                 modifier = sections()
@@ -205,7 +208,7 @@ fun DpmPermissions(myDpm: DevicePolicyManager, myComponent: ComponentName, myCon
                 Text("（恢复出厂设置不变）")
                 if(specificId!=""){
                     Text(specificId)
-                    Button(onClick = {myDpm.setOrganizationId(specificId)}, enabled = specificId!="") {
+                    Button(onClick = {myDpm.setOrganizationId(specificId)}) {
                         Text("设置为组织ID")
                     }
                 }else{
@@ -259,7 +262,7 @@ fun DpmPermissions(myDpm: DevicePolicyManager, myComponent: ComponentName, myCon
             }
         }
 
-        if(isdo&&VERSION.SDK_INT>=24){
+        if(isDeviceOwner(myDpm)&&VERSION.SDK_INT>=24){
             DeviceOwnerInfo(R.string.owner_lockscr_info,R.string.place_holder,R.string.owner_lockscr_info,focusManager,myContext,
                 {myDpm.deviceOwnerLockScreenInfo},{content ->  myDpm.setDeviceOwnerLockScreenInfo(myComponent,content)})
             DeviceOwnerInfo(R.string.support_msg,R.string.support_msg_desc,R.string.message,focusManager,myContext,
@@ -326,6 +329,5 @@ fun activateDeviceAdmin(inputContext:Context,inputComponent:ComponentName){
     val intent = Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN)
     intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, inputComponent)
     intent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION, "在这里激活Android Owner")
-    intent.setFlags(FLAG_ACTIVITY_NEW_TASK)
     startActivity(inputContext,intent,null)
 }