diff --git a/android/app/src/main/java/github/tornaco/android/thanos/main/NavActivity.java b/android/app/src/main/java/github/tornaco/android/thanos/main/NavActivity.java index ba69be8d2..95b2d18cf 100644 --- a/android/app/src/main/java/github/tornaco/android/thanos/main/NavActivity.java +++ b/android/app/src/main/java/github/tornaco/android/thanos/main/NavActivity.java @@ -30,7 +30,6 @@ import github.tornaco.android.thanos.app.BaseTrustedActivity; import github.tornaco.android.thanos.app.donate.DonateActivity; import github.tornaco.android.thanos.core.app.ThanosManager; -import github.tornaco.android.thanos.core.util.OsUtils; import github.tornaco.android.thanos.databinding.ActivityNavBinding; import github.tornaco.android.thanos.onboarding.OnBoardingActivity; import github.tornaco.android.thanos.pref.AppPreference; @@ -209,23 +208,14 @@ private void showRebootPage() { } private void showActiveDialog() { - if (OsUtils.isROrAbove()) { - exportPatchUi.show(new Runnable() { - @Override - public void run() { - NavActivityPermissionRequester.exportMagiskZipRequestedChecked(NavActivity.this); - } - }); - } else { - new MaterialAlertDialogBuilder(NavActivity.this) - .setTitle(R.string.status_not_active) - .setMessage(R.string.message_active_needed) - .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { - // Noop. - }) - .create() - .show(); - } + new MaterialAlertDialogBuilder(NavActivity.this) + .setTitle(R.string.status_not_active) + .setMessage(R.string.message_active_needed) + .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { + // Noop. + }) + .create() + .show(); } private void showFrameworkErrorDialog() { diff --git a/android/app/src/main/res/values-zh-rCN/strings.xml b/android/app/src/main/res/values-zh-rCN/strings.xml index b13fab3e3..89de48066 100644 --- a/android/app/src/main/res/values-zh-rCN/strings.xml +++ b/android/app/src/main/res/values-zh-rCN/strings.xml @@ -7,7 +7,7 @@ 已激活 未激活 - 请在XposedInstaller中激活 + Thanox支持Xposed和Magisk两种激活方式。\n\n对于Xposed用户,在Xposed模块页面勾选Thanox即可。\n\n对于Magisk用户,你可以将下载的Thanox安装包文件拓展名,由.apk修改为.zip后通过MagiskManager刷入。\n如果你找不到Thanox安装包,你可以点击设置,关于,补丁状态按钮,导出Magisk模块的zip包 请重启 核心初始化错误 Thanox可信初始化时遇到兼容性错误,可能会影响某些功能,请把/data/system/thanos/log下面的日志反馈给开发者 diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml index 00e66a1aa..30743256f 100644 --- a/android/app/src/main/res/values-zh-rTW/strings.xml +++ b/android/app/src/main/res/values-zh-rTW/strings.xml @@ -7,7 +7,7 @@ 已激活 未激活 - 請在XposedInstaller中激活 + Thanox支持Xposed和Magisk兩種激活方式。\n\n對於Xposed用戶,在Xposed模塊頁面勾選Thanox即可。\n\n對於Magisk用戶,你可以將下載的Thanox安裝包文件拓展名,由.apk修改為.zip後通過MagiskManager刷入。\n如果你找不到Thanox安裝包,你可以点击设置,关于,补丁状态按钮,導出Magisk模塊的zip包 請重啟 核心初始化錯誤 Thanox可信初始化時遇到兼容性錯誤,可能會影響某些功能,請把/data/system/thanos/log下面的日誌反饋給開發者 diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 86e85fc83..8d313398d 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -7,7 +7,7 @@ Active Not active - Please activate Thanox in XposedInstaller + Thanox support both Xposed and Magisk.\n\n For Xposed user, you can just select and check Thanox in Xposed app module config page. \n\nFor Magisk user, you can rename downloaded Thanox apk from .apk to .zip and then install in Magisk manager, or if you can not find the downloaded apk, you can go to Settings, About, Patch status to export the patch Reboot Framework error There is an error during the initialization of the Thanox framework. Please report the logs under /data/system/thanos/log to the developer. diff --git a/android/internal/Thanox-Internal b/android/internal/Thanox-Internal index f0d76ae60..0dd79333b 160000 --- a/android/internal/Thanox-Internal +++ b/android/internal/Thanox-Internal @@ -1 +1 @@ -Subproject commit f0d76ae60b8d42644e4b0d78caf267dff00d62a9 +Subproject commit 0dd79333b976d98b89543525fc43c15d473f214d