improve code quality

Author: Dev4Mod

app/src/main/java/com/wmods/wppenhacer/xposed/core/FeatureLoader.java

@@ -180,12 +180,34 @@ private static void initComponents(ClassLoader loader, XSharedPreferences pref)
         FMessageWpp.init(loader);
         Utils.init(loader);
         WppCore.addListenerActivity((activity, state) -> {
-            XposedBridge.log("Activity: " + activity.getClass().getSimpleName() + " " + state);
+            // Check for Change Preferences
+            if (state == WppCore.ActivityChangeState.ChangeType.RESUME) {
+                checkUpdate(activity);
+            }
+
+            // Check for Update
             if (activity.getClass().getSimpleName().equals("HomeActivity") && state == WppCore.ActivityChangeState.ChangeType.START) {
-                XposedBridge.log("Starting UpdateChecker");
                 CompletableFuture.runAsync(new UpdateChecker(activity));
             }
         });
+
+    }
+
+    private static void checkUpdate(@NonNull Activity activity) {
+        if (WppCore.getPrivBoolean("need_restart", false)) {
+            WppCore.setPrivBoolean("need_restart", false);
+            try {
+                new AlertDialogWpp(activity).
+                        setMessage(activity.getString(ResId.string.restart_wpp)).
+                        setPositiveButton(activity.getString(ResId.string.yes), (dialog, which) -> {
+                            if (!Utils.doRestart(activity))
+                                Toast.makeText(activity, "Unable to rebooting activity", Toast.LENGTH_SHORT).show();
+                        })
+                        .setNegativeButton(activity.getString(ResId.string.no), null)
+                        .show();
+            } catch (Exception ignored) {
+            }
+        }
     }
 
     private static void registerReceivers() {

app/src/main/java/com/wmods/wppenhacer/xposed/core/WaCallback.java

@@ -4,15 +4,10 @@
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.wmods.wppenhacer.xposed.core.components.AlertDialogWpp;
-import com.wmods.wppenhacer.xposed.utils.ResId;
-import com.wmods.wppenhacer.xposed.utils.Utils;
-
 public class WaCallback implements Application.ActivityLifecycleCallbacks {
     @Override
     public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) {
@@ -32,20 +27,6 @@ public void onActivityStarted(@NonNull Activity activity) {
     public void onActivityResumed(@NonNull Activity activity) {
         WppCore.mCurrentActivity = activity;
         WppCore.activities.add(activity);
-        if (WppCore.getPrivBoolean("need_restart", false)) {
-            WppCore.setPrivBoolean("need_restart", false);
-            try {
-                new AlertDialogWpp(activity).
-                        setMessage(activity.getString(ResId.string.restart_wpp)).
-                        setPositiveButton(activity.getString(ResId.string.yes), (dialog, which) -> {
-                            if (!Utils.doRestart(activity))
-                                Toast.makeText(activity, "Unable to rebooting activity", Toast.LENGTH_SHORT).show();
-                        })
-                        .setNegativeButton(activity.getString(ResId.string.no), null)
-                        .show();
-            } catch (Exception ignored) {
-            }
-        }
         triggerActivityState(activity, WppCore.ActivityChangeState.ChangeType.RESUME);
     }