diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java index f9db42a73..805892a6a 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/Async.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/Async.java @@ -68,7 +68,7 @@ public class Async { @Override protected void onPostExecute(Void v) { - CallbackHandler.triggerCallback(StatusFragment.updateCheckDone); + StatusFragment.updateCheckDone.trigger(); } } @@ -77,7 +77,7 @@ public class Async { @Override public void handleResults(int i) { StatusFragment.SNCheckResult = i; - CallbackHandler.triggerCallback(StatusFragment.safetyNetDone); + StatusFragment.safetyNetDone.trigger(); } }.requestTest(); } @@ -92,7 +92,7 @@ public class Async { @Override protected void onPostExecute(Void v) { - CallbackHandler.triggerCallback(ModulesFragment.moduleLoadDone); + ModulesFragment.moduleLoadDone.trigger(); } } @@ -112,7 +112,7 @@ public class Async { @Override protected void onPostExecute(Void v) { - CallbackHandler.triggerCallback(ReposFragment.repoLoadDone); + ReposFragment.repoLoadDone.trigger(); } } diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/CallbackHandler.java b/app/src/main/java/com/topjohnwu/magisk/utils/CallbackHandler.java index 58244bd7c..454146a11 100644 --- a/app/src/main/java/com/topjohnwu/magisk/utils/CallbackHandler.java +++ b/app/src/main/java/com/topjohnwu/magisk/utils/CallbackHandler.java @@ -23,8 +23,7 @@ public class CallbackHandler { } } - public static void triggerCallback(Event event) { - event.isTriggered = true; + private static void triggerCallback(Event event) { HashSet list = listeners.get(event); if (list != null) { for (EventListener listener : list) { @@ -35,6 +34,10 @@ public class CallbackHandler { public static class Event { public boolean isTriggered = false; + public void trigger() { + isTriggered = true; + triggerCallback(this); + } } public interface EventListener {