From 765fb3b8c1680c1e3b312e3270492f336f5c4fea Mon Sep 17 00:00:00 2001 From: BinTianqi <1220958406@qq.com> Date: Mon, 5 Feb 2024 15:04:15 +0800 Subject: [PATCH] new device control features --- .../com/binbin/androidowner/DeviceControl.kt | 86 +++++++++++++++---- .../com/binbin/androidowner/Permissions.kt | 2 +- .../java/com/binbin/androidowner/Receiver.kt | 5 +- .../main/res/drawable/description_fill0.xml | 9 ++ app/src/main/res/values/strings.xml | 4 + 5 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable/description_fill0.xml diff --git a/app/src/main/java/com/binbin/androidowner/DeviceControl.kt b/app/src/main/java/com/binbin/androidowner/DeviceControl.kt index a60d34f..0dbb6c2 100644 --- a/app/src/main/java/com/binbin/androidowner/DeviceControl.kt +++ b/app/src/main/java/com/binbin/androidowner/DeviceControl.kt @@ -1,12 +1,12 @@ package com.binbin.androidowner -import android.app.admin.DeviceAdminReceiver import android.app.admin.DevicePolicyManager import android.app.admin.DevicePolicyManager.* +import android.app.admin.WifiSsidPolicy import android.content.ComponentName import android.content.Context +import android.net.wifi.WifiSsid import android.os.Build.VERSION -import android.util.Log import android.widget.Toast import androidx.activity.ComponentActivity import androidx.compose.animation.AnimatedVisibility @@ -28,6 +28,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -63,6 +64,8 @@ fun DeviceControl(){ DeviceCtrlItem(R.string.auto_timezone,R.string.place_holder,R.drawable.globe_fill0, {myDpm.getAutoTimeZoneEnabled(myComponent)},{b -> myDpm.setAutoTimeZoneEnabled(myComponent,b) } ) + }else{ + DeviceCtrlItem(R.string.auto_time,R.string.place_holder,R.drawable.schedule_fill0,{myDpm.autoTimeRequired},{b -> myDpm.setAutoTimeRequired(myComponent,b)}) } if(isDeviceOwner(myDpm)|| isProfileOwner(myDpm)){ DeviceCtrlItem(R.string.master_mute,R.string.place_holder,R.drawable.volume_up_fill0, @@ -79,11 +82,26 @@ fun DeviceControl(){ {myDpm.getBluetoothContactSharingDisabled(myComponent)},{b -> myDpm.setBluetoothContactSharingDisabled(myComponent,b)} ) } - if(VERSION.SDK_INT>=26){ + if(VERSION.SDK_INT>=26&&(isDeviceOwner(myDpm)||isProfileOwner(myDpm))){ DeviceCtrlItem(R.string.network_logging,R.string.no_effect,R.drawable.wifi_fill0, {myDpm.isNetworkLoggingEnabled(myComponent)},{b -> myDpm.setNetworkLoggingEnabled(myComponent,b) } ) } + if(VERSION.SDK_INT>=24&&isDeviceOwner(myDpm)){ + DeviceCtrlItem(R.string.secure_logging,R.string.no_effect,R.drawable.description_fill0, + {myDpm.isSecurityLoggingEnabled(myComponent)},{b -> myDpm.setSecurityLoggingEnabled(myComponent,b) } + ) + } + if(VERSION.SDK_INT>=33&&isDeviceOwner(myDpm)){ + DeviceCtrlItem(R.string.preferential_network_service,R.string.no_effect,R.drawable.globe_fill0, + {myDpm.isPreferentialNetworkServiceEnabled},{b -> myDpm.isPreferentialNetworkServiceEnabled = b} + ) + } + if(VERSION.SDK_INT>=30&&isDeviceOwner(myDpm)){ + DeviceCtrlItem(R.string.common_criteria_mode,R.string.common_criteria_mode_desc,R.drawable.security_fill0, + {myDpm.isCommonCriteriaModeEnabled(myComponent)},{b -> myDpm.setCommonCriteriaModeEnabled(myComponent,b)} + ) + } if(VERSION.SDK_INT>=31&&isDeviceOwner(myDpm)){ if(myDpm.canUsbDataSignalingBeDisabled()){ DeviceCtrlItem(R.string.usb_signal,R.string.place_holder,R.drawable.usb_fill0, @@ -93,18 +111,13 @@ fun DeviceControl(){ Text(text = "你的设备不支持关闭USB信号",modifier = Modifier.fillMaxWidth(), style = bodyTextStyle, textAlign = TextAlign.Center) } } - if(VERSION.SDK_INT<24&&isDeviceOwner(myDpm)){ - Text(text = "重启和WiFi Mac需要API24",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) - } - if(VERSION.SDK_INT<26&&isDeviceOwner(myDpm)){ - Text(text = "备份服务和网络日志需要API26",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) - } - if(VERSION.SDK_INT<30&&isDeviceOwner(myDpm)){ - Text(text = "自动设置时间和自动设置时区需要API30",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) - } - if(VERSION.SDK_INT<31&&isDeviceOwner(myDpm)){Text(text = "关闭USB信号需API31",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle)} - if(VERSION.SDK_INT<34&&isDeviceOwner(myDpm)){ - Text(text = "隐藏状态栏需要API34",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) + if(isDeviceOwner(myDpm)){ + if(VERSION.SDK_INT<23){ Text(text = "禁止蓝牙分享联系人需API23") } + if(VERSION.SDK_INT<24){ Text(text = "安全日志API24",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) } + if(VERSION.SDK_INT<26){ Text(text = "备份服务和网络日志需要API26",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) } + if(VERSION.SDK_INT<30){ Text(text = "自动设置时区和通用标准模式需要API30",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) } + if(VERSION.SDK_INT<31){ Text(text = "关闭USB信号需API31",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) } + if(VERSION.SDK_INT<34){ Text(text = "隐藏状态栏需要API34",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) } } if(VERSION.SDK_INT>=28){ Column(modifier = sections()) { @@ -143,6 +156,7 @@ fun DeviceControl(){ } } } + if(VERSION.SDK_INT<24){ Text(text = "重启和WiFi Mac需要API24",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center, style = bodyTextStyle) } if(VERSION.SDK_INT>=24){ val wifimac = try { myDpm.getWifiMacAddress(myComponent).toString() }catch(e:SecurityException){ "没有权限" } Text(text = "WiFi MAC: $wifimac",modifier=Modifier.fillMaxWidth(), textAlign = TextAlign.Center,style=bodyTextStyle) @@ -155,6 +169,48 @@ fun DeviceControl(){ Text(text = "清除用户Ca证书") }} + if(VERSION.SDK_INT>=28){ + Column(modifier = sections()){ + Text(text = "修改时间", style = typography.titleLarge) + var inputTime by remember{mutableStateOf("")} + Text(text = "从epoch(1970/1/1 00:00:00 UTC)到现在(毫秒)") + TextField( + value = inputTime, + label = { Text("时间(ms)")}, + onValueChange = {inputTime = it}, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number, imeAction = ImeAction.Done), + keyboardActions = KeyboardActions(onDone = {focusMgr.clearFocus()}), + enabled = isDeviceOwner(myDpm), + modifier = Modifier.fillMaxWidth().padding(vertical = 2.dp) + ) + if(isWear){ + Button( + onClick = {inputTime = System.currentTimeMillis().toString()}, + modifier = Modifier.fillMaxWidth() + ) { + Text("获取当前时间") + } + } + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween){ + Button( + onClick = {myDpm.setTime(myComponent,inputTime.toLong())}, + modifier = Modifier.fillMaxWidth(if(isWear){1F}else{0.35F}), + enabled = inputTime!=""&&isDeviceOwner(myDpm) + ) { + Text("应用") + } + if(!isWear){ + Button( + onClick = {inputTime = System.currentTimeMillis().toString()}, + modifier = Modifier.fillMaxWidth(0.98F) + ) { + Text("获取当前时间") + } + } + } + } + } + if(VERSION.SDK_INT>=34&&isDeviceOwner(myDpm)){ Column(modifier = sections()){ Text(text = "MTE策略", style = typography.titleLarge, color = colorScheme.onPrimaryContainer) diff --git a/app/src/main/java/com/binbin/androidowner/Permissions.kt b/app/src/main/java/com/binbin/androidowner/Permissions.kt index 4998bcc..a01184a 100644 --- a/app/src/main/java/com/binbin/androidowner/Permissions.kt +++ b/app/src/main/java/com/binbin/androidowner/Permissions.kt @@ -378,7 +378,7 @@ fun DeviceOwnerInfo( onValueChange = { inputContent=it }, modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp) ) - Row(modifier = Modifier.fillMaxWidth().padding(vertical = if(isWear){2.dp}else{6.dp}), horizontalArrangement = Arrangement.SpaceBetween) { + Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) { Button( onClick = { output(inputContent.toString()) diff --git a/app/src/main/java/com/binbin/androidowner/Receiver.kt b/app/src/main/java/com/binbin/androidowner/Receiver.kt index c0b5e2a..ecaeac8 100644 --- a/app/src/main/java/com/binbin/androidowner/Receiver.kt +++ b/app/src/main/java/com/binbin/androidowner/Receiver.kt @@ -16,7 +16,10 @@ class MyDeviceAdminReceiver : DeviceAdminReceiver() { @SuppressLint("UnsafeProtectedBroadcastReceiver") override fun onReceive(context: Context, intent: Intent) { super.onReceive(context, intent) - if(VERSION.SDK_INT>=26){ DeviceAdminReceiver().onNetworkLogsAvailable(context,intent,1234567890,20) } + if(VERSION.SDK_INT>=26){ + DeviceAdminReceiver().onNetworkLogsAvailable(context,intent,1234567890,20) + DeviceAdminReceiver().onSecurityLogsAvailable(context,intent) + } } override fun onDisableRequested(context: Context, intent: Intent): CharSequence { Toast.makeText(context, "撤销授权", Toast.LENGTH_SHORT).show() diff --git a/app/src/main/res/drawable/description_fill0.xml b/app/src/main/res/drawable/description_fill0.xml new file mode 100644 index 0000000..3fff890 --- /dev/null +++ b/app/src/main/res/drawable/description_fill0.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b0f64ee..1b9fe93 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -115,4 +115,8 @@ 屏幕超时 超时后锁屏(毫秒)，0为由用户决定 超时时间(ms) + 安全日志 + 通用标准模式 + Common Criteria + 优先网络服务