From c726dbe3751cc889b023f77d90a8bd97f130a457 Mon Sep 17 00:00:00 2001
From: DerGoogler <jxhazhungerz@gmail.com>
Date: Tue, 3 May 2022 18:57:39 +0200
Subject: [PATCH] Making improvements

- Update libsu to `5.0.0`
- Fix reboot button displays on fail install
---
 app/build.gradle                                              | 2 +-
 app/src/main/java/com/fox2code/mmm/MainActivity.java          | 4 ++++
 .../java/com/fox2code/mmm/installer/InstallerActivity.java    | 4 +---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3a3abb3..569854f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -97,7 +97,7 @@ dependencies {
     // Utils
     implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.3'
     implementation 'com.squareup.okhttp3:okhttp-brotli:4.9.3'
-    implementation 'com.github.topjohnwu.libsu:io:4.0.3'
+    implementation 'com.github.topjohnwu.libsu:io:5.0.0'
 
     // Markdown
     implementation "io.noties.markwon:core:4.6.2"
diff --git a/app/src/main/java/com/fox2code/mmm/MainActivity.java b/app/src/main/java/com/fox2code/mmm/MainActivity.java
index ef62b1b..3afe7cf 100644
--- a/app/src/main/java/com/fox2code/mmm/MainActivity.java
+++ b/app/src/main/java/com/fox2code/mmm/MainActivity.java
@@ -20,6 +20,7 @@ import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.fox2code.mmm.compat.CompatActivity;
 import com.fox2code.mmm.compat.CompatDisplay;
@@ -32,7 +33,9 @@ import com.fox2code.mmm.repo.RepoManager;
 import com.fox2code.mmm.settings.SettingsActivity;
 import com.fox2code.mmm.utils.Http;
 import com.fox2code.mmm.utils.IntentHelper;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.topjohnwu.superuser.Shell;
 
 import eightbitlab.com.blurview.BlurView;
 import eightbitlab.com.blurview.RenderScriptBlur;
@@ -135,6 +138,7 @@ public class MainActivity extends CompatActivity implements SwipeRefreshLayout.O
         this.searchView.setEnabled(false); // Enabled later
         this.cardIconifyUpdate();
         this.updateScreenInsets(this.getResources().getConfiguration());
+
         InstallerInitializer.tryGetMagiskPathAsync(new InstallerInitializer.Callback() {
             @Override
             public void onPathReceived(String path) {
diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
index aa85393..7304acb 100644
--- a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
+++ b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java
@@ -317,8 +317,6 @@ public class InstallerActivity extends CompatActivity {
                         .getInputStream(zipFile.getEntry("module.prop")));
             } catch (IOException ignored) {
             }
-                        .getInputStream(moduleProp));
-            } catch (IOException ignored) {}
             int compatFlags = AppUpdateManager.getFlagsForModule(moduleId);
             if ((compatFlags & AppUpdateManager.FLAG_COMPAT_NEED_32BIT) != 0)
                 needs32bit = true;
@@ -639,7 +637,6 @@ public class InstallerActivity extends CompatActivity {
                     Shell.cmd(reboot_cmd).submit();
                 }
             });
-            this.rebootFloatingButton.setVisibility(View.VISIBLE);
 
             if (message != null && !message.isEmpty())
                 this.installerTerminal.addLine(message);
@@ -661,6 +658,7 @@ public class InstallerActivity extends CompatActivity {
                             IntentHelper.openConfig(this, config);
                             return true;
                         });
+                        this.rebootFloatingButton.setVisibility(View.VISIBLE);
                     } catch (PackageManager.NameNotFoundException e) {
                         Log.w(TAG, "Config package \"" +
                                 configPkg + "\" missing for installer view");