v6.2

Author: BinTianqi

Diff for: Guide.md

@@ -1,37 +1,49 @@
-# OwnDroid
-
 [简体中文](Readme.md)
 
-### Description
-
-Use Device admin and Device owner privilege to take full control of your device.
-
-### Docs
-
-A renewed OwnDroid docs are available on [owndroid.pages.dev](https://owndroid.pages.dev)
-
-### Advantage
-
-- Open source. Device owner privilege could be more dangerous than root, close-source software's security is not guaranteed. 
-- Easy to use. You can use this utility easily. English docs are also provided.
-- Modern. This app is built with Kotlin and Jetpack Compose, designed with Material Design 3. And some new features on Android 14 is adapted. 
-- Maintaining. This project is updating. Any Issue and PR is welcome. 
-
-### Disadvantage
+# OwnDroid
 
-This software may not have as many features as Google's official [TestDPC](https://github.com/googlesamples/android-testdpc) 
+Use Android Device owner privilege to manage your device.
 
-### Features
+## Features
 
 - System
+  - Options: disable camera, disable screenshot, master volume mute, disable USB signal...
+  - Permission policy
+  - _Wipe data_
+  - ...
 - Network
+  - Minimum Wi-Fi security level
+  - Always-on VPN
+  - Network logging
+  - ...
 - Work profile
-- App manage
-- User restrictions
-- User manage
+  - Create work profile
+  - Suspend personal apps
+  - ...
+- Applications
+  - Suspend/hide app
+  - Block app uninstallation
+  - Install/uninstall app
+  - ...
+- User restriction
+  - Network: disable configuring mobile network, disable configuring Wi-Fi, disable SMS, disable outgoing calls...
+  - Connection: disable bluetooth, disable configuring location, disable USB file transfer, disable printing...
+  - Applications: disable installing/uninstalling app...
+  - Users: disable adding/removing/switching user...
+  - Media: disable configuring brightness, disable adjusting volume...
+  - Other: disable modifying accounts, disable configuring locale, disable factory reset, disable debug features...
+- User manager
+  - User information
+  - Start/switch/stop/delete user
+  - Create user
+  - ...
 - Password and keyguard
+  - _Reset password_
+  - Require password complexity
+  - Set screen timeout
+  - ...
 
-### License
+## License
 
 [License.md](LICENSE.md)
 

Diff for: Readme-en.md

@@ -1,37 +1,49 @@
-# OwnDroid
-
 [English](Readme-en.md)
 
-### 简介
-
-使用安卓的Device Admin和Device Owner特权，完全掌控你的设备。
-
-### 文档
-
-全新的OwnDroid文档：[owndroid.pages.dev](https://owndroid.pages.dev/zh_CN)
-
-### 优点
-
-- 开源。Device owner权限可能比root权限更危险，闭源软件的安全性没有保证
-- 易于使用。应用中的功能清晰明了，并且有在线的文档
-- 现代化。使用 Kotlin + Jetpack Compose，使用Material Design 3，适配安卓14的一些新功能
-- 维护中。这个项目正在不断更新。欢迎 Issue 和 Pull request
-
-### 缺点
+# OwnDroid
 
-- 功能没有谷歌官方的 [TestDPC](https://github.com/googlesamples/android-testdpc) 那么全
+使用安卓Device owner特权管理你的设备。
 
-### 功能
+## 功能
 
 - 系统
+  - 选项：禁用摄像头、禁止截屏、全局静音、禁用USB信号...
+  - 权限策略
+  - 清除数据
+  - ...
 - 网络
+  - 最小Wi-Fi安全等级
+  - VPN保持打开
+  - 网络日志
+  - ...
 - 工作资料
+  - 创建工作资料
+  - 挂起个人应用
+  - ...
 - 应用管理
+  - 挂起/隐藏应用
+  - 阻止应用卸载
+  - 安装/卸载应用
+  - ...
 - 用户限制
+  - 网络：禁止配置移动网络、禁止配置Wi-Fi、禁用短信、禁止拨出电话...
+  - 连接：禁用蓝牙、禁止配置定位、禁用USB文件传输、禁用打印...
+  - 应用：禁止安装/卸载应用...
+  - 用户：禁止添加/删除/切换用户...
+  - 媒体：禁止调整亮度、禁止调整音量...
+  - 其他：禁止修改账号、禁止修改语言、禁止恢复出场设置、禁用调试功能...
 - 用户管理
+  - 用户信息
+  - 启动/切换/停止/删除用户
+  - 创建用户
+  - ...
 - 密码与锁屏
+  - 重置密码
+  - 要求密码复杂度
+  - 设置屏幕超时
+  - ...
 
-### 许可证
+## 许可证
 
 [License.md](LICENSE.md)
 

Diff for: Readme.md

@@ -2,7 +2,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.compose)
-    kotlin("plugin.serialization") version "2.0.0"
+    kotlin("plugin.serialization") version "2.0.21"
 }
 
 android {
@@ -24,8 +24,8 @@ android {
         applicationId = "com.bintianqi.owndroid"
         minSdk = 21
         targetSdk = 34
-        versionCode = 32
-        versionName = "6.0"
+        versionCode = 34
+        versionName = "6.2"
         multiDexEnabled = false
     }
 
@@ -68,6 +68,14 @@ android {
     }
 }
 
+kotlin {
+    sourceSets {
+        all {
+            languageSettings.optIn("kotlinx.serialization.ExperimentalSerializationApi")
+        }
+    }
+}
+
 gradle.taskGraph.whenReady {
     project.tasks.findByPath(":app:test")?.enabled = false
     project.tasks.findByPath(":app:lint")?.enabled = false
@@ -76,6 +84,7 @@ gradle.taskGraph.whenReady {
 
 dependencies {
     implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
     implementation(libs.accompanist.drawablepainter)
     implementation(libs.androidx.material3)
     implementation(libs.androidx.navigation.compose)

Diff for: app/build.gradle.kts

@@ -3,5 +3,5 @@ package com.bintianqi.owndroid;
 interface IUserService {
     void destroy() = 16777114;
     String execute(String command) = 1;
-    String getUid() = 2;
+    int getUid() = 2;
 }

Diff for: app/src/main/aidl/com/bintianqi/owndroid/IUserService.aidl

@@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -64,11 +65,10 @@ class InstallAppActivity: FragmentActivity() {
                 apkInfoText += "${context.getString(R.string.version_code)}: ${apkInfo.versionCode}"
             }
         }
+        val vm by viewModels<MyViewModel>()
+        if(!vm.initialized) vm.initialize(applicationContext)
         setContent {
-            OwnDroidTheme(
-                sharedPref.getBoolean("material_you", true),
-                sharedPref.getBoolean("black_theme", false)
-            ) {
+            OwnDroidTheme(vm) {
                 AlertDialog(
                     properties = DialogProperties(dismissOnBackPress = false, dismissOnClickOutside = false),
                     title = {

Diff for: app/src/main/java/com/bintianqi/owndroid/InstallAppActivity.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
@@ -30,7 +31,6 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -48,6 +48,7 @@ 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 androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -66,12 +67,14 @@ import com.bintianqi.owndroid.dpm.getReceiver
 import com.bintianqi.owndroid.dpm.isDeviceAdmin
 import com.bintianqi.owndroid.dpm.isDeviceOwner
 import com.bintianqi.owndroid.dpm.isProfileOwner
+import com.bintianqi.owndroid.dpm.setDefaultAffiliationID
 import com.bintianqi.owndroid.dpm.toggleInstallAppActivity
 import com.bintianqi.owndroid.ui.Animations
 import com.bintianqi.owndroid.ui.theme.OwnDroidTheme
 import com.rosan.dhizuku.api.Dhizuku
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
 import org.lsposed.hiddenapibypass.HiddenApiBypass
 import java.util.Locale
 
@@ -85,19 +88,19 @@ class MainActivity : FragmentActivity() {
         enableEdgeToEdge()
         WindowCompat.setDecorFitsSystemWindows(window, false)
         super.onCreate(savedInstanceState)
-        val sharedPref = applicationContext.getSharedPreferences("data", Context.MODE_PRIVATE)
+        val context = applicationContext
+        val sharedPref = context.getSharedPreferences("data", MODE_PRIVATE)
         if (VERSION.SDK_INT >= 28) HiddenApiBypass.setHiddenApiExemptions("")
-        if(sharedPref.getBoolean("auth", false)) {
-            showAuth.value = true
-        }
-        val locale = applicationContext.resources?.configuration?.locale
+        if(sharedPref.getBoolean("auth", false)) showAuth.value = true
+        val locale = context.resources?.configuration?.locale
         zhCN = locale == Locale.SIMPLIFIED_CHINESE || locale == Locale.CHINESE || locale == Locale.CHINA
         toggleInstallAppActivity()
+        val vm by viewModels<MyViewModel>()
+        if(!vm.initialized) vm.initialize(context)
+        lifecycleScope.launch { delay(5000); setDefaultAffiliationID(context) }
         setContent {
-            val materialYou = remember { mutableStateOf(sharedPref.getBoolean("material_you", true)) }
-            val blackTheme = remember { mutableStateOf(sharedPref.getBoolean("black_theme", false)) }
-            OwnDroidTheme(materialYou.value, blackTheme.value) {
-                Home(materialYou, blackTheme)
+            OwnDroidTheme(vm) {
+                Home(vm)
                 if(showAuth.value) {
                     AuthScreen(this, showAuth)
                 }
@@ -107,7 +110,7 @@ class MainActivity : FragmentActivity() {
 
     override fun onResume() {
         super.onResume()
-        val sharedPref = applicationContext.getSharedPreferences("data", Context.MODE_PRIVATE)
+        val sharedPref = applicationContext.getSharedPreferences("data", MODE_PRIVATE)
         if(
             sharedPref.getBoolean("auth", false) &&
             sharedPref.getBoolean("lock_in_background", false)
@@ -128,7 +131,7 @@ class MainActivity : FragmentActivity() {
 
 @ExperimentalMaterial3Api
 @Composable
-fun Home(materialYou:MutableState<Boolean>, blackTheme:MutableState<Boolean>) {
+fun Home(vm: MyViewModel) {
     val navCtrl = rememberNavController()
     val context = LocalContext.current
     val dpm = context.getDPM()
@@ -154,14 +157,14 @@ fun Home(materialYou:MutableState<Boolean>, blackTheme:MutableState<Boolean>) {
         popExitTransition = Animations.navHostPopExitTransition
     ) {
         composable(route = "HomePage") { HomePage(navCtrl) }
-        composable(route = "SystemManage") { SystemManage(navCtrl) }
+        composable(route = "System") { SystemManage(navCtrl) }
         composable(route = "ManagedProfile") { ManagedProfile(navCtrl) }
         composable(route = "Permissions") { DpmPermissions(navCtrl) }
-        composable(route = "ApplicationManage") { ApplicationManage(navCtrl, dialogStatus) }
+        composable(route = "Applications") { ApplicationManage(navCtrl, dialogStatus) }
         composable(route = "UserRestriction") { UserRestriction(navCtrl) }
-        composable(route = "UserManage") { UserManage(navCtrl) }
+        composable(route = "Users") { UserManage(navCtrl) }
         composable(route = "Password") { Password(navCtrl) }
-        composable(route = "AppSetting") { AppSetting(navCtrl, materialYou, blackTheme) }
+        composable(route = "Settings") { AppSetting(navCtrl, vm) }
         composable(route = "Network") { Network(navCtrl) }
         composable(route = "PackageSelector") { PackageSelector(navCtrl) }
     }
@@ -234,7 +237,7 @@ private fun HomePage(navCtrl:NavHostController) {
                 if(activateType != "") { Text(text = activateType, color = colorScheme.onPrimary) }
             }
         }
-        HomePageItem(R.string.system_manage, R.drawable.mobile_phone_fill0, "SystemManage", navCtrl)
+        HomePageItem(R.string.system, R.drawable.android_fill0, "System", navCtrl)
         if(deviceOwner || profileOwner) { HomePageItem(R.string.network, R.drawable.wifi_fill0, "Network", navCtrl) }
         if(
             (VERSION.SDK_INT < 24 && !deviceOwner) || (
@@ -244,13 +247,13 @@ private fun HomePage(navCtrl:NavHostController) {
         ) {
             HomePageItem(R.string.work_profile, R.drawable.work_fill0, "ManagedProfile", navCtrl)
         }
-        if(deviceOwner || profileOwner) HomePageItem(R.string.app_manager, R.drawable.apps_fill0, "ApplicationManage", navCtrl)
+        if(deviceOwner || profileOwner) HomePageItem(R.string.applications, R.drawable.apps_fill0, "Applications", navCtrl)
         if(VERSION.SDK_INT >= 24 && (profileOwner || deviceOwner)) {
             HomePageItem(R.string.user_restrict, R.drawable.person_off, "UserRestriction", navCtrl)
         }
-        HomePageItem(R.string.user_manager,R.drawable.manage_accounts_fill0,"UserManage", navCtrl)
+        HomePageItem(R.string.users,R.drawable.manage_accounts_fill0,"Users", navCtrl)
         HomePageItem(R.string.password_and_keyguard, R.drawable.password_fill0, "Password", navCtrl)
-        HomePageItem(R.string.setting, R.drawable.settings_fill0, "AppSetting", navCtrl)
+        HomePageItem(R.string.settings, R.drawable.settings_fill0, "Settings", navCtrl)
         Spacer(Modifier.padding(vertical = 20.dp))
     }
 }