From 7adc7368040622d40639ffcf5b41275a1fc1ca43 Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Wed, 19 Jul 2023 21:24:59 -0400 Subject: [PATCH] few final fixes for 2.2.3 Signed-off-by: androidacy-user --- .../com/fox2code/mmm/installer/InstallerActivity.kt | 2 +- .../com/fox2code/mmm/installer/InstallerInitializer.kt | 8 +++----- 2 files changed, 4 insertions(+), 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 index 35515c0..a5c27c7 100644 --- 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 index 88ee67c..7325c7a 100644 --- 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 - }*/ + } } } }