diff --git a/app/src/main/java/com/drdisagree/iconify/ui/activities/Onboarding.java b/app/src/main/java/com/drdisagree/iconify/ui/activities/Onboarding.java index af5d0e184..98f0448a9 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/activities/Onboarding.java +++ b/app/src/main/java/com/drdisagree/iconify/ui/activities/Onboarding.java @@ -558,8 +558,8 @@ protected Integer doInBackground(Void... voids) { hasErroredOut = ModuleUtil.flashModule(ModuleUtil.createModule(Resources.TEMP_MODULE_DIR, Resources.TEMP_DIR + "/Iconify.zip")); } catch (Exception e) { hasErroredOut = true; - writeLog(TAG, "Error creating module zip", e); - e.printStackTrace(); + writeLog(TAG, "Failed to create/flash module zip", e); + Log.e(TAG, "Failed to create/flash module zip\n" + e); } } diff --git a/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtil.java b/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtil.java index dd8761947..2d38e2f84 100644 --- a/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtil.java +++ b/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtil.java @@ -72,14 +72,6 @@ static void installModule() { Log.i(TAG, "Magisk module successfully created."); } - public static boolean flashModule(String modulePath) { - if (RootUtil.isMagiskInstalled()) { - return !Shell.cmd("magisk --install-module " + modulePath).exec().isSuccess(); - } else { - return !Shell.cmd("/data/adb/ksud module install " + modulePath).exec().isSuccess(); - } - } - private static void writePostExec() { StringBuilder post_exec = new StringBuilder(); boolean primaryColorEnabled = false; @@ -157,4 +149,23 @@ public static String createModule(String sourceFolder, String destinationFilePat return zipFile.getFile().getAbsolutePath(); } } + + public static boolean flashModule(String modulePath) throws Exception { + Shell.Result result; + + if (RootUtil.isMagiskInstalled()) { + result = Shell.cmd("magisk --install-module " + modulePath).exec(); + } else { + result = Shell.cmd("/data/adb/ksud module install " + modulePath).exec(); + } + + if (result.isSuccess()) { + Log.i(TAG, "Successfully flashed module"); + } else { + Log.e(TAG, "Failed to flash module"); + throw new Exception(String.join("\n", result.getOut())); + } + + return !result.isSuccess(); + } }