diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/HomeScreen.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/HomeScreen.kt index cb7cedd..7be1413 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/page/HomeScreen.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/HomeScreen.kt @@ -209,7 +209,7 @@ private fun InfoCard() { modifier = Modifier.align(Alignment.End), onClick = { val cm = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - cm.setPrimaryClip(ClipData.newPlainText("LSPatch", contents.toString())) + cm.setPrimaryClip(ClipData.newPlainText("NPatch", contents.toString())) scope.launch { snackbarHost.showSnackbar(copiedMessage) } }, content = { Text(stringResource(android.R.string.copy)) } diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt index fa07e33..9a80844 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/NewPatchScreen.kt @@ -471,7 +471,7 @@ private fun DoPatchBody(modifier: Modifier, navigator: DestinationsNavigator) { val result = snackbarHost.showSnackbar(installFailed, copyError) if (result == SnackbarResult.ActionPerformed) { val cm = lspApp.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - cm.setPrimaryClip(ClipData.newPlainText("LSPatch", message)) + cm.setPrimaryClip(ClipData.newPlainText("NPatch", message)) } } installation = null // Reset installation state @@ -511,7 +511,7 @@ private fun DoPatchBody(modifier: Modifier, navigator: DestinationsNavigator) { modifier = Modifier.weight(1f), onClick = { val cm = lspApp.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - cm.setPrimaryClip(ClipData.newPlainText("LSPatch", viewModel.logs.joinToString(separator = "\n") { it.second })) + cm.setPrimaryClip(ClipData.newPlainText("NPatch", viewModel.logs.joinToString(separator = "\n") { it.second })) }, content = { Text(stringResource(R.string.copy_error)) } ) diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/page/manage/AppManagePage.kt b/manager/src/main/java/org/lsposed/lspatch/ui/page/manage/AppManagePage.kt index 7064b02..77f9c16 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/page/manage/AppManagePage.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/page/manage/AppManagePage.kt @@ -118,7 +118,7 @@ fun AppManageBody( val result = snackbarHost.showSnackbar(updateFailed, copyError) if (result == SnackbarResult.ActionPerformed) { val cm = lspApp.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager - cm.setPrimaryClip(ClipData.newPlainText("LSPatch", it.toString())) + cm.setPrimaryClip(ClipData.newPlainText("NPatch", it.toString())) } } viewModel.dispatch(AppManageViewModel.ViewAction.ClearUpdateLoaderResult) diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/util/Utils.kt b/manager/src/main/java/org/lsposed/lspatch/ui/util/Utils.kt index 680a17a..b8660a4 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/util/Utils.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/util/Utils.kt @@ -31,7 +31,7 @@ fun checkIsApkFixedByLSP(context: Context, packageName: String): Boolean { return try { val app = context.packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA) - (app.metaData?.containsKey("lspatch") != true) + (app.metaData?.containsKey("npatch") != true) } catch (_: PackageManager.NameNotFoundException) { Log.e("NPatch", "Package not found: $packageName") false diff --git a/manager/src/main/java/org/lsposed/lspatch/ui/viewmodel/manage/AppManageViewModel.kt b/manager/src/main/java/org/lsposed/lspatch/ui/viewmodel/manage/AppManageViewModel.kt index e533c7b..d5565c9 100644 --- a/manager/src/main/java/org/lsposed/lspatch/ui/viewmodel/manage/AppManageViewModel.kt +++ b/manager/src/main/java/org/lsposed/lspatch/ui/viewmodel/manage/AppManageViewModel.kt @@ -43,7 +43,7 @@ class AppManageViewModel : ViewModel() { val appList: List> by derivedStateOf { LSPPackageManager.appList.mapNotNull { appInfo -> runCatching { - appInfo.app.metaData?.getString("lspatch")?.let { + appInfo.app.metaData?.getString("npatch")?.let { val json = Base64.decode(it, Base64.DEFAULT).toString(Charsets.UTF_8) Log.d(TAG, "Read patched config: $json") val config = Gson().fromJson(json, PatchConfig::class.java) diff --git a/manager/src/main/java/org/lsposed/lspatch/util/ShizukuApi.kt b/manager/src/main/java/org/lsposed/lspatch/util/ShizukuApi.kt index 1d63c8f..17e590d 100644 --- a/manager/src/main/java/org/lsposed/lspatch/util/ShizukuApi.kt +++ b/manager/src/main/java/org/lsposed/lspatch/util/ShizukuApi.kt @@ -64,7 +64,7 @@ object ShizukuApi { } else { iPackageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA, userId) } - return (app != null) && (app.metaData?.containsKey("lspatch") != true) + return (app != null) && (app.metaData?.containsKey("npatch") != true) } fun uninstallPackage(packageName: String, intentSender: IntentSender) { diff --git a/patch-loader/src/main/java/org/lsposed/lspatch/loader/SigBypass.java b/patch-loader/src/main/java/org/lsposed/lspatch/loader/SigBypass.java index 2d70b32..46cb289 100644 --- a/patch-loader/src/main/java/org/lsposed/lspatch/loader/SigBypass.java +++ b/patch-loader/src/main/java/org/lsposed/lspatch/loader/SigBypass.java @@ -44,7 +44,7 @@ public class SigBypass { try { var metaData = context.getPackageManager().getApplicationInfo(packageName, PackageManager.GET_META_DATA).metaData; String encoded = null; - if (metaData != null) encoded = metaData.getString("lspatch"); + if (metaData != null) encoded = metaData.getString("npatch"); if (encoded != null) { var json = new String(Base64.decode(encoded, Base64.DEFAULT), StandardCharsets.UTF_8); try { diff --git a/patch/src/main/java/org/lsposed/patch/LSPatch.java b/patch/src/main/java/org/lsposed/patch/LSPatch.java index a4d63aa..9979d86 100644 --- a/patch/src/main/java/org/lsposed/patch/LSPatch.java +++ b/patch/src/main/java/org/lsposed/patch/LSPatch.java @@ -475,7 +475,7 @@ public class LSPatch { } }); - property.addMetaData(new ModificationProperty.MetaData("lspatch", metadata)); + property.addMetaData(new ModificationProperty.MetaData("npatch", metadata)); // TODO: replace query_all with queries -> manager if (useManager) property.addUsesPermission("android.permission.QUERY_ALL_PACKAGES");