Archives/FoxMagiskModuleManager
2
0
Fork 0
mirror of https://github.com/Fox2Code/FoxMagiskModuleManager synced 2024-10-30 15:20:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix possible NullPointerException if install failed. (Fix #167)

Browse Source
This commit is contained in:
Fox2Code 2022-06-17 16:07:09 +02:00
parent 2c5a552221
commit 392409be45
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
View File

@ -360,7 +360,7 @@ public class InstallerActivity extends CompatActivity {
installExecutable = this.extractInstallScript("anykernel3_installer.sh");
if (installExecutable == null) {
this.setInstallStateFinished(false,
"! Failed to extract AnyKernel3 install script", null);
"! Failed to extract AnyKernel3 install script", "");
return;
}
// "unshare -m" is needed to force mount namespace isolation.
@ -379,7 +379,7 @@ public class InstallerActivity extends CompatActivity {
installExecutable = this.extractInstallScript("module_installer_compat.sh");
if (installExecutable == null) {
this.setInstallStateFinished(false,
"! Failed to extract Magisk module install script", null);
"! Failed to extract Magisk module install script", "");
return;
}
installCommand = ASH + " \"" +
@ -387,7 +387,7 @@ public class InstallerActivity extends CompatActivity {
" 3 1 \"" + file.getAbsolutePath() + "\"";
} else {
this.setInstallStateFinished(false,
"! Zip file is not a valid Magisk module or AnyKernel3 zip!", null);
"! Zip file is not a valid Magisk module or AnyKernel3 zip!", "");
return;
}
installerMonitor = new InstallerMonitor(installExecutable);
@ -697,7 +697,7 @@ public class InstallerActivity extends CompatActivity {
if (message != null && !message.isEmpty())
this.installerTerminal.addLine(message);
if (!optionalLink.isEmpty()) {
if (optionalLink != null && !optionalLink.isEmpty()) {
this.setActionBarExtraMenuButton(ActionButtonType.supportIconForUrl(optionalLink),
menu -> {
IntentHelper.openUrl(this, optionalLink);