diff --git a/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java
index b1393bb1..bbf9f816 100644
--- a/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java
+++ b/app/src/main/java/org/lsposed/manager/ui/activity/base/BaseActivity.java
@@ -32,17 +32,9 @@ import android.view.Window;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.material.color.DynamicColors;
-
-import org.lsposed.manager.BuildConfig;
-import org.lsposed.manager.ConfigManager;
import org.lsposed.manager.R;
-import org.lsposed.manager.ui.dialog.BlurBehindDialogBuilder;
-import org.lsposed.manager.ui.dialog.FlashDialogBuilder;
-import org.lsposed.manager.util.NavUtil;
import org.lsposed.manager.util.Telemetry;
import org.lsposed.manager.util.ThemeUtil;
-import org.lsposed.manager.util.UpdateUtil;
import rikka.material.app.MaterialActivity;
@@ -54,23 +46,6 @@ public class BaseActivity extends MaterialActivity {
public void onCreate(@Nullable Bundle savedInstanceState) {
setTheme(R.style.AppTheme);
super.onCreate(savedInstanceState);
- // make sure the versions are consistent
- if (BuildConfig.DEBUG) return;
- if (!ConfigManager.isBinderAlive()) return;
- var version = ConfigManager.getXposedVersionCode();
- if (BuildConfig.VERSION_CODE == version) return;
- new BlurBehindDialogBuilder(this)
- .setMessage(getString(R.string.version_mismatch, version, BuildConfig.VERSION_CODE))
- .setPositiveButton(android.R.string.ok, (dialog, id) -> {
- if (UpdateUtil.canInstall()) {
- new FlashDialogBuilder(this, (d, i) -> finish()).show();
- } else {
- NavUtil.startURL(this, getString(R.string.install_url));
- finish();
- }
- })
- .setCancelable(false)
- .show();
}
@Override
diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java
index c780bf28..fe5bc92c 100644
--- a/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/org/lsposed/manager/ui/fragment/HomeFragment.java
@@ -172,31 +172,27 @@ public class HomeFragment extends BaseFragment implements MenuProvider {
binding.apiVersion.setText(String.valueOf(ConfigManager.getXposedApiVersion()));
binding.api.setText(ConfigManager.isDexObfuscateEnabled() ? R.string.enabled : R.string.not_enabled);
binding.frameworkVersion.setText(String.format(LocaleDelegate.getDefaultLocale(), "%1$s (%2$d)", ConfigManager.getXposedVersionName(), ConfigManager.getXposedVersionCode()));
+ binding.managerVersion.setText(activity.getPackageName());
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.android_version_unsatisfied)));
} else switch (ConfigManager.getDex2OatWrapperCompatibility()) {
- case ILSPManagerService.DEX2OAT_OK:
- binding.dex2oatWrapper.setText(R.string.supported);
- break;
- case ILSPManagerService.DEX2OAT_CRASHED:
- binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.crashed)));
- break;
- case ILSPManagerService.DEX2OAT_MOUNT_FAILED:
- binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.mount_failed)));
- break;
- case ILSPManagerService.DEX2OAT_SELINUX_PERMISSIVE:
- binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.selinux_permissive)));
- break;
- case ILSPManagerService.DEX2OAT_SEPOLICY_INCORRECT:
- binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.sepolicy_incorrect)));
- break;
+ case ILSPManagerService.DEX2OAT_OK ->
+ binding.dex2oatWrapper.setText(R.string.supported);
+ case ILSPManagerService.DEX2OAT_CRASHED ->
+ binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.crashed)));
+ case ILSPManagerService.DEX2OAT_MOUNT_FAILED ->
+ binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.mount_failed)));
+ case ILSPManagerService.DEX2OAT_SELINUX_PERMISSIVE ->
+ binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.selinux_permissive)));
+ case ILSPManagerService.DEX2OAT_SEPOLICY_INCORRECT ->
+ binding.dex2oatWrapper.setText(String.format(LocaleDelegate.getDefaultLocale(), "%s (%s)", getString(R.string.unsupported), getString(R.string.sepolicy_incorrect)));
}
} else {
binding.apiVersion.setText(R.string.not_installed);
binding.api.setText(R.string.not_installed);
binding.frameworkVersion.setText(R.string.not_installed);
+ binding.managerVersion.setText(String.format(LocaleDelegate.getDefaultLocale(), "%1$s (%2$d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
}
- binding.managerVersion.setText(String.format(LocaleDelegate.getDefaultLocale(), "%1$s (%2$d)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
if (Build.VERSION.PREVIEW_SDK_INT != 0) {
binding.systemVersion.setText(String.format(LocaleDelegate.getDefaultLocale(), "%1$s Preview (API %2$d)", Build.VERSION.CODENAME, Build.VERSION.SDK_INT));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9aab21bf..38c2576c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -76,6 +76,7 @@
SELinux policy is incorrect
Update LSPosed
Confirm to update LSPosed? This device will reboot after update completion
+ Copied to clipboard
Welcome to LSPosed
@@ -227,13 +228,11 @@
No more release
Failed to load module repo: %s
Upgradable first
-
-
- The version of the LSPosed framework (%1$d) does not match manager (%2$d). Please reinstall LSPosed.
- Manager crashed
- Send crash info
- Crash info copied to clipboard
- Copied to clipboard
+ Installed
+
+ - %d download
+ - %d downloads
+
Sakura
@@ -255,9 +254,5 @@
Deep orange
Brown
Blue grey
- Installed
-
- - %d download
- - %d downloads
-
+
diff --git a/gradle.properties b/gradle.properties
index 48cdd843..eaa0a156 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,3 +14,4 @@
android.experimental.enableNewResourceShrinker.preciseShrinking=true
android.enableAppCompileTimeRClass=true
android.useAndroidX=true
+android.nonFinalResIds=false