awfixer/OwnDroid
1
0
Fork 0
mirror of https://github.com/awfixers-stuff/OwnDroid.git synced 2026-03-23 19:15:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

update some strings

Browse Source
This commit is contained in:
BinTianqi
2024-06-12 12:09:17 +08:00
parent 9ff670231d
commit f49f250eaa
12 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/bintianqi/owndroid/Receiver.kt
View File

@@ -40,7 +40,7 @@ class PackageInstallerReceiver:BroadcastReceiver(){
val toastText = when(intent.getIntExtra(EXTRA_STATUS,999)){
STATUS_PENDING_USER_ACTION->R.string.status_pending_action
STATUS_SUCCESS->R.string.success
STATUS_FAILURE->R.string.fail
STATUS_FAILURE->R.string.failed
STATUS_FAILURE_BLOCKED->R.string.status_fail_blocked
STATUS_FAILURE_ABORTED->R.string.status_fail_aborted
STATUS_FAILURE_INVALID->R.string.status_fail_invalid

14
app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
View File

@@ -310,7 +310,7 @@ private fun Home(
}
SubPageItem(R.string.install_app, "", R.drawable.install_mobile_fill0) { navCtrl.navigate("InstallApp") }
SubPageItem(R.string.uninstall_app, "", R.drawable.delete_fill0) { navCtrl.navigate("UninstallApp") }
if(VERSION.SDK_INT >= 34 && (isDeviceOwner(dpm) || isProfileOwner(dpm))) {
if(VERSION.SDK_INT >= 34 && (isDeviceOwner(dpm) || dpm.isOrgProfile(receiver))) {
SubPageItem(R.string.set_default_dialer, "", R.drawable.call_fill0) { defaultDialerAppDialog.value = true }
}
Spacer(Modifier.padding(vertical = 30.dp))
@@ -385,7 +385,7 @@ private fun PermissionManage(pkgName: String, navCtrl: NavHostController) {
var inputPermission by remember { mutableStateOf("") }
var currentState by remember { mutableStateOf(context.getString(R.string.unknown)) }
val grantState = mapOf(
PERMISSION_GRANT_STATE_DEFAULT to stringResource(R.string.decide_by_user),
PERMISSION_GRANT_STATE_DEFAULT to stringResource(R.string.default_stringres),
PERMISSION_GRANT_STATE_GRANTED to stringResource(R.string.granted),
PERMISSION_GRANT_STATE_DENIED to stringResource(R.string.denied)
)
@@ -451,7 +451,7 @@ private fun PermissionManage(pkgName: String, navCtrl: NavHostController) {
},
modifier = Modifier.fillMaxWidth()
) {
Text(stringResource(R.string.decide_by_user))
Text(stringResource(R.string.default_stringres))
}
Spacer(Modifier.padding(vertical = 30.dp))
}
@@ -590,7 +590,7 @@ private fun CredentialManagePolicy(pkgName: String) {
}
Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
} catch(e:java.lang.IllegalArgumentException) {
Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
} finally {
refreshPolicy()
}
@@ -990,7 +990,7 @@ private fun ClearAppDataDialog(status: MutableState<Boolean>, pkgName: String) {
val toastText =
if(pkg!="") { "$pkg\n" }else{ "" } +
context.getString(R.string.clear_data) +
context.getString(if(succeed) R.string.success else R.string.fail )
context.getString(if(succeed) R.string.success else R.string.failed )
Toast.makeText(context, toastText, Toast.LENGTH_SHORT).show()
Looper.loop()
}
@@ -1037,7 +1037,7 @@ private fun DefaultDialerAppDialog(status: MutableState<Boolean>, pkgName: Strin
dpm.setDefaultDialerApplication(pkgName)
Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
}catch(e:IllegalArgumentException) {
Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
}
status.value = false
}
@@ -1072,7 +1072,7 @@ private fun EnableSystemAppDialog(status: MutableState<Boolean>, pkgName: String
dpm.enableSystemApp(receiver, pkgName)
Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
} catch(e: IllegalArgumentException) {
Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
}
status.value = false
}

11
app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
View File

@@ -13,7 +13,6 @@ import android.app.admin.DevicePolicyManager.WIFI_SECURITY_ENTERPRISE_192
import android.app.admin.DevicePolicyManager.WIFI_SECURITY_ENTERPRISE_EAP
import android.app.admin.DevicePolicyManager.WIFI_SECURITY_OPEN
import android.app.admin.DevicePolicyManager.WIFI_SECURITY_PERSONAL
import android.app.admin.WifiSsidPolicy
import android.app.admin.WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST
import android.app.admin.WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST
import android.content.ComponentName
@@ -378,7 +377,7 @@ private fun PrivateDNS() {
val operationResult = mapOf(
PRIVATE_DNS_SET_NO_ERROR to stringResource(R.string.success),
PRIVATE_DNS_SET_ERROR_HOST_NOT_SERVING to stringResource(R.string.host_not_serving_dns_tls),
PRIVATE_DNS_SET_ERROR_FAILURE_SETTING to stringResource(R.string.fail)
PRIVATE_DNS_SET_ERROR_FAILURE_SETTING to stringResource(R.string.failed)
)
var status by remember { mutableStateOf(dnsStatus[dpm.getGlobalPrivateDnsMode(receiver)]) }
Spacer(Modifier.padding(vertical = 5.dp))
@@ -488,7 +487,7 @@ private fun WifiAuthKeypair() {
Button(
onClick = {
val result = dpm.grantKeyPairToWifiAuth(keyPair)
Toast.makeText(context, if(result) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(result) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
modifier = Modifier.fillMaxWidth(0.49F)
) {
@@ -497,7 +496,7 @@ private fun WifiAuthKeypair() {
Button(
onClick = {
val result = dpm.revokeKeyPairFromWifiAuth(keyPair)
Toast.makeText(context, if(result) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(result) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
modifier = Modifier.fillMaxWidth(0.96F)
) {
@@ -863,7 +862,7 @@ private fun APN() {
Button(
onClick = {
val success = dpm.updateOverrideApn(receiver,id,result)
Toast.makeText(context, if(success) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(success) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
Modifier.fillMaxWidth(0.49F)
) {
@@ -872,7 +871,7 @@ private fun APN() {
Button(
onClick = {
val success = dpm.removeOverrideApn(receiver,id)
Toast.makeText(context, if(success) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(success) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
Modifier.fillMaxWidth(0.96F)
) {

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

@@ -168,7 +168,7 @@ private fun ResetPasswordToken() {
onClick = {
Toast.makeText(
context,
if(dpm.clearResetPasswordToken(receiver)) R.string.success else R.string.fail,
if(dpm.clearResetPasswordToken(receiver)) R.string.success else R.string.failed,
Toast.LENGTH_SHORT
).show()
},
@@ -181,7 +181,7 @@ private fun ResetPasswordToken() {
try {
Toast.makeText(
context,
if(dpm.setResetPasswordToken(receiver, tokenByteArray)) R.string.success else R.string.fail,
if(dpm.setResetPasswordToken(receiver, tokenByteArray)) R.string.success else R.string.failed,
Toast.LENGTH_SHORT
).show()
}catch(e:SecurityException) {
@@ -267,7 +267,7 @@ private fun ResetPassword() {
onClick = {
val resetSuccess = dpm.resetPasswordWithToken(receiver,newPwd,tokenByteArray,resetPwdFlag)
if(resetSuccess) { Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show(); newPwd=""}
else{ Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show() }
else{ Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show() }
confirmed=false
},
colors = ButtonDefaults.buttonColors(containerColor = colorScheme.error, contentColor = colorScheme.onError),
@@ -281,7 +281,7 @@ private fun ResetPassword() {
onClick = {
val resetSuccess = dpm.resetPassword(newPwd,resetPwdFlag)
if(resetSuccess) { Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show(); newPwd="" }
else{ Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show() }
else{ Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show() }
confirmed=false
},
enabled = confirmed,
@@ -670,6 +670,6 @@ private fun activateToken(context: Context) {
if (confirmIntent != null) {
startActivity(context,confirmIntent, null)
} else {
Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
}
}

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

@@ -118,14 +118,14 @@ private fun Home(localNavCtrl:NavHostController,listScrollState:ScrollState) {
if(isDeviceOwner(dpm) || isProfileOwner(dpm)) {
SubPageItem(R.string.disable_account_management, "", R.drawable.account_circle_fill0) { localNavCtrl.navigate("NoManagementAccount") }
}
if(VERSION.SDK_INT >= 24&&isDeviceOwner(dpm)) {
if(VERSION.SDK_INT >= 24 && (isDeviceOwner(dpm) || dpm.isOrgProfile(receiver))) {
SubPageItem(R.string.device_owner_lock_screen_info, "", R.drawable.screen_lock_portrait_fill0) { localNavCtrl.navigate("LockScreenInfo") }
}
if(VERSION.SDK_INT >= 24 && (isDeviceOwner(dpm) || isProfileOwner(dpm))) {
if(VERSION.SDK_INT >= 24 && dpm.isAdminActive(receiver)) {
SubPageItem(R.string.support_msg, "", R.drawable.chat_fill0) { localNavCtrl.navigate("SupportMsg") }
}
if(VERSION.SDK_INT >= 28 && (isDeviceOwner(dpm) || isProfileOwner(dpm))) {
SubPageItem(R.string.transform_ownership, "", R.drawable.admin_panel_settings_fill0) { localNavCtrl.navigate("TransformOwnership") }
SubPageItem(R.string.transfer_ownership, "", R.drawable.admin_panel_settings_fill0) { localNavCtrl.navigate("TransformOwnership") }
}
Spacer(Modifier.padding(vertical = 30.dp))
}
@@ -475,7 +475,7 @@ private fun DisableAccountManagement() {
OutlinedTextField(
value = inputText,
onValueChange = { inputText = it },
label = { Text(stringResource(R.string.account_types_is)) },
label = { Text(stringResource(R.string.account_types_are)) },
modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
keyboardActions = KeyboardActions(onDone = { focusMgr.clearFocus() })
@@ -513,9 +513,9 @@ private fun TransformOwnership() {
var pkg by remember { mutableStateOf("") }
var cls by remember { mutableStateOf("") }
Spacer(Modifier.padding(vertical = 10.dp))
Text(text = stringResource(R.string.transform_ownership), style = typography.headlineLarge)
Text(text = stringResource(R.string.transfer_ownership), style = typography.headlineLarge)
Spacer(Modifier.padding(vertical = 5.dp))
Text(text = stringResource(R.string.transform_ownership_desc))
Text(text = stringResource(R.string.transfer_ownership_desc))
Spacer(Modifier.padding(vertical = 5.dp))
OutlinedTextField(
value = pkg, onValueChange = { pkg = it }, label = { Text(stringResource(R.string.target_package_name)) },
@@ -537,12 +537,12 @@ private fun TransformOwnership() {
dpm.transferOwnership(receiver,ComponentName(pkg, cls),null)
Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
}catch(e:IllegalArgumentException) {
Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
}
},
modifier = Modifier.fillMaxWidth()
) {
Text(stringResource(R.string.transform))
Text(stringResource(R.string.transfer))
}
Spacer(Modifier.padding(vertical = 30.dp))
}

12
app/src/main/java/com/bintianqi/owndroid/dpm/SystemManager.kt
View File

@@ -303,7 +303,7 @@ private fun Keyguard() {
if(VERSION.SDK_INT >= 23) {
Button(
onClick = {
Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,true)) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,true)) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
enabled = isDeviceOwner(dpm) || (VERSION.SDK_INT >= 28 && isProfileOwner(dpm) && dpm.isAffiliatedUser),
modifier = Modifier.fillMaxWidth()
@@ -312,7 +312,7 @@ private fun Keyguard() {
}
Button(
onClick = {
Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,false)) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(dpm.setKeyguardDisabled(receiver,false)) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
enabled = isDeviceOwner(dpm) || (VERSION.SDK_INT >= 28 && isProfileOwner(dpm) && dpm.isAffiliatedUser),
modifier = Modifier.fillMaxWidth()
@@ -361,7 +361,7 @@ private fun BugReportDialog(status: MutableState<Boolean>) {
TextButton(
onClick = {
val result = dpm.requestBugreport(receiver)
Toast.makeText(context, if(result) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(result) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
status.value = false
}
) {
@@ -465,7 +465,7 @@ private fun EditTimeZone() {
Button(
onClick = {
val result = dpm.setTimeZone(receiver, inputTimezone)
Toast.makeText(context, if(result) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(result) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
modifier = Modifier.width(100.dp)
) {
@@ -824,7 +824,7 @@ private fun CaCert() {
Button(
onClick = {
val result = dpm.installCaCert(receiver, caCertByteArray)
Toast.makeText(context, if(result) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(result) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
exist = dpm.hasCaCertInstalled(receiver, caCertByteArray)
},
modifier = Modifier.fillMaxWidth(0.49F)
@@ -836,7 +836,7 @@ private fun CaCert() {
if(exist) {
dpm.uninstallCaCert(receiver, caCertByteArray)
exist = dpm.hasCaCertInstalled(receiver, caCertByteArray)
Toast.makeText(context, if(exist) R.string.fail else R.string.success, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(exist) R.string.failed else R.string.success, Toast.LENGTH_SHORT).show()
} else { Toast.makeText(context, R.string.not_exist, Toast.LENGTH_SHORT).show() }
},
modifier = Modifier.fillMaxWidth(0.96F)

8
app/src/main/java/com/bintianqi/owndroid/dpm/UserManager.kt
View File

@@ -236,7 +236,7 @@ private fun UserOperation() {
Button(
onClick = {
focusMgr.clearFocus()
Toast.makeText(context, if(dpm.switchUser(receiver,userHandleById)) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(dpm.switchUser(receiver,userHandleById)) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
modifier = Modifier.fillMaxWidth()
) {
@@ -250,7 +250,7 @@ private fun UserOperation() {
val result = dpm.stopUser(receiver,userHandleById)
Toast.makeText(context, userOperationResultCode(result,context), Toast.LENGTH_SHORT).show()
}catch(e:IllegalArgumentException) {
Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
}
},
modifier = Modifier.fillMaxWidth()
@@ -265,7 +265,7 @@ private fun UserOperation() {
Toast.makeText(context, R.string.success, Toast.LENGTH_SHORT).show()
idInput = ""
}else{
Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show()
}
},
modifier = Modifier.fillMaxWidth()
@@ -323,7 +323,7 @@ private fun CreateUser() {
onClick = {
newUserHandle = dpm.createAndManageUser(receiver, userName, receiver, null, selectedFlag)
focusMgr.clearFocus()
Toast.makeText(context, if(newUserHandle!=null) R.string.success else R.string.fail, Toast.LENGTH_SHORT).show()
Toast.makeText(context, if(newUserHandle!=null) R.string.success else R.string.failed, Toast.LENGTH_SHORT).show()
},
modifier = Modifier.fillMaxWidth()
) {

2
app/src/main/java/com/bintianqi/owndroid/ui/Components.kt
View File

@@ -186,7 +186,7 @@ fun CopyTextButton(@StringRes label: Int, content: String) {
if(!ok) {
scope.launch {
if(writeClipBoard(context,content)) { ok = true; delay(2000); ok = false }
else{ Toast.makeText(context, R.string.fail, Toast.LENGTH_SHORT).show() }
else{ Toast.makeText(context, R.string.failed, Toast.LENGTH_SHORT).show() }
}
}
}