few final fixes for 2.2.3

Signed-off-by: androidacy-user <[email protected]>
Androidacy · Jul 20, 2023 · 7adc736 · 7adc736
1 parent 386a58c
commit 7adc736
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerActivity.kt b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerActivity.kt
@@ -380,7 +380,7 @@ class InstallerActivity : FoxActivity() {
             }
             installerMonitor = InstallerMonitor(installScript)
             installJob = Shell.cmd(
-                "export ASH_STANDALONE=1",
+                "export ASH_STANDALONE=1 exec /data/adb/magisk/busybox ash",
                 "export MMM_EXT_SUPPORT=1",
                 "export MMM_USER_LANGUAGE=" + this.resources.configuration.locales[0].toLanguageTag(),
                 "export MMM_APP_VERSION=" + BuildConfig.VERSION_NAME,

diff --git a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt
@@ -154,11 +154,9 @@ class InstallerInitializer {
                 Companion.mgskVerCode = mgskVerCode
                 return mgskPth
             } catch (ignored: Exception) {
-                // TODO: REMOVE THIS
-                throw IllegalStateException(ignored)
-                /*return if (tries <= 10) {
+                // work around edge case
+                return if (tries <= 10) {
                     tries++
-                    // sleep tries * 25ms
                     try {
                         Thread.sleep(tries * 50L)
                     } catch (e: InterruptedException) {
@@ -167,7 +165,7 @@ class InstallerInitializer {
                     tryGetMagiskPath(true)
                 } else {
                     null
-                }*/
+                }
             }
         }
     }