From aadf2f54b798e5bcf677132a6231d200a3de3461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=8C=E8=8D=89=E9=85=B8=E9=85=AF?= <17663689+kotori2@users.noreply.github.com> Date: Wed, 3 Feb 2021 03:47:59 +0800 Subject: [PATCH] [manager] Fix null pointer (#55) --- .../manager/ui/activity/MainActivity.java | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java index a524a297..5670a099 100644 --- a/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java +++ b/app/src/main/java/io/github/lsposed/manager/ui/activity/MainActivity.java @@ -33,20 +33,23 @@ public class MainActivity extends BaseActivity { super.onCreate(savedInstanceState); // make sure the versions are consistent - Version managerVersion = new Version(BuildConfig.VERSION_NAME); - Version coreVersion = new Version(Constants.getXposedVersion()); + String coreVersionStr = Constants.getXposedVersion(); - if (!managerVersion.equals(coreVersion)) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(R.string.outdated_manager) - .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int id) { - android.os.Process.killProcess(android.os.Process.myPid()); - } - }) - .setCancelable(false); - Dialog dlg = builder.create(); - dlg.show(); + if (coreVersionStr != null) { + Version managerVersion = new Version(BuildConfig.VERSION_NAME); + Version coreVersion = new Version(coreVersionStr); + if (!managerVersion.equals(coreVersion)) { + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setMessage(R.string.outdated_manager) + .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + android.os.Process.killProcess(android.os.Process.myPid()); + } + }) + .setCancelable(false); + Dialog dlg = builder.create(); + dlg.show(); + } } binding = ActivityMainBinding.inflate(getLayoutInflater());