various tweaks

Signed-off-by: androidacy-user <opensource@androidacy.com>

Author: androidacy-user

app/src/main/java/com/fox2code/mmm/MainApplication.java

@@ -54,7 +54,8 @@ public class MainApplication extends FoxApplication implements androidx.work.Con
     private static final String timeFormatString = "dd MMM yyyy"; // Example: 13 july 2001
     private static final Shell.Builder shellBuilder;
     private static final long secret;
-    @SuppressLint("RestrictedApi") // Use FoxProcess wrapper helper.
+    @SuppressLint("RestrictedApi")
+    // Use FoxProcess wrapper helper.
     private static final boolean wrapped = !FoxProcessExt.isRootLoader();
     private static Locale timeFormatLocale = Resources.getSystem().getConfiguration().locale;
     private static SimpleDateFormat timeFormat = new SimpleDateFormat(timeFormatString, timeFormatLocale);
@@ -63,7 +64,6 @@ public class MainApplication extends FoxApplication implements androidx.work.Con
     @SuppressLint("StaticFieldLeak")
     private static MainApplication INSTANCE;
     private static boolean firstBoot;
-    private static boolean loadSentryInitialized;
 
     static {
         Shell.setDefaultBuilder(shellBuilder = Shell.Builder.create().setFlags(Shell.FLAG_REDIRECT_STDERR).setTimeout(10).setInitializers(InstallerInitializer.class));
@@ -142,7 +142,8 @@ public static boolean isBlurEnabled() {
     }
 
     public static boolean isDeveloper() {
-        if (BuildConfig.DEBUG) return true;
+        if (BuildConfig.DEBUG)
+            return true;
         return getSharedPreferences().getBoolean("developer", false);
     }
 
@@ -171,9 +172,7 @@ public static void setHasGottenRootAccess(boolean bool) {
     }
 
     public static boolean isCrashReportingEnabled() {
-        return SentryMain.IS_SENTRY_INSTALLED &&
-                getSharedPreferences().getBoolean("pref_crash_reporting",
-                        BuildConfig.DEFAULT_ENABLE_CRASH_REPORTING);
+        return SentryMain.IS_SENTRY_INSTALLED && getSharedPreferences().getBoolean("pref_crash_reporting", BuildConfig.DEFAULT_ENABLE_CRASH_REPORTING);
     }
 
     public static SharedPreferences getBootSharedPreferences() {
@@ -194,7 +193,8 @@ public static boolean isNotificationPermissionGranted() {
     }
 
     public Markwon getMarkwon() {
-        if (this.markwon != null) return this.markwon;
+        if (this.markwon != null)
+            return this.markwon;
         FoxThemeWrapper contextThemeWrapper = this.markwonThemeContext;
         if (contextThemeWrapper == null) {
             contextThemeWrapper = this.markwonThemeContext = new FoxThemeWrapper(this, this.managerThemeResId);
@@ -276,7 +276,8 @@ public boolean isDarkTheme() {
 
     @Override
     public void onCreate() {
-        if (INSTANCE == null) INSTANCE = this;
+        if (INSTANCE == null)
+            INSTANCE = this;
         relPackageName = this.getPackageName();
         super.onCreate();
         SharedPreferences sharedPreferences = MainApplication.getSharedPreferences();
@@ -362,24 +363,30 @@ public void clearAppData() {
                 String[] children = cacheDir.list();
                 if (children != null) {
                     for (String s : children) {
-                        if (BuildConfig.DEBUG) Log.w("MainApplication", "Deleting " + s);
+                        if (BuildConfig.DEBUG)
+                            Log.w("MainApplication", "Deleting " + s);
                         if (!s.equals("lib")) {
                             if (!new File(cacheDir, s).delete()) {
-                                if (BuildConfig.DEBUG) Log.w("MainApplication", "Failed to delete " + s);
+                                if (BuildConfig.DEBUG)
+                                    Log.w("MainApplication", "Failed to delete " + s);
                             }
                         }
                     }
                 }
             }
-            if (BuildConfig.DEBUG) Log.w("MainApplication", "Deleting cache dir");
+            if (BuildConfig.DEBUG)
+                Log.w("MainApplication", "Deleting cache dir");
             this.deleteSharedPreferences("mmm_boot");
             this.deleteSharedPreferences("mmm");
             this.deleteSharedPreferences("sentry");
             this.deleteSharedPreferences("androidacy");
-            if (BuildConfig.DEBUG) Log.w("MainApplication", "Deleting shared prefs");
+            if (BuildConfig.DEBUG)
+                Log.w("MainApplication", "Deleting shared prefs");
             this.getPackageManager().clearPackagePreferredActivities(this.getPackageName());
-            if (BuildConfig.DEBUG) Log.w("MainApplication", "Done clearing app data");
-        } catch (Exception e) {
+            if (BuildConfig.DEBUG)
+                Log.w("MainApplication", "Done clearing app data");
+        } catch (
+                Exception e) {
             Log.e("MainApplication", "Failed to clear app data", e);
         }
     }

app/src/main/java/com/fox2code/mmm/androidacy/AndroidacyRepoData.java

@@ -1,7 +1,9 @@
 package com.fox2code.mmm.androidacy;
 
+import android.annotation.SuppressLint;
+import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Looper;
+import android.net.Uri;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -26,6 +28,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -64,7 +68,8 @@ public AndroidacyRepoData(File cacheRoot, SharedPreferences cachedPreferences, b
                 if (!modulesJson.createNewFile()) {
                     throw new IOException("Failed to create modules.json");
                 }
-            } catch (IOException e) {
+            } catch (
+                    IOException e) {
                 e.printStackTrace();
             }
         }
@@ -144,7 +149,8 @@ public boolean isValidToken(String token) throws IOException, NoSuchAlgorithmExc
         String deviceId = generateDeviceId();
         try {
             Http.doHttpGet("https://" + this.host + "/auth/me?token=" + token + "&device_id=" + deviceId, false);
-        } catch (HttpException e) {
+        } catch (
+                HttpException e) {
             if (e.getErrorCode() == 401) {
                 Log.w(TAG, "Invalid token, resetting...");
                 // Remove saved preference
@@ -159,6 +165,7 @@ public boolean isValidToken(String token) throws IOException, NoSuchAlgorithmExc
         return true;
     }
 
+    @SuppressLint("RestrictedApi")
     @Override
     protected boolean prepare() throws NoSuchAlgorithmException {
         // If ANDROIDACY_CLIENT_ID is not set or is empty, disable this repo and return
@@ -168,28 +175,44 @@ protected boolean prepare() throws NoSuchAlgorithmException {
             editor.apply();
             return false;
         }
-        if (Http.needCaptchaAndroidacy()) return false;
+        if (Http.needCaptchaAndroidacy())
+            return false;
         // Implementation details discussed on telegram
         // First, ping the server to check if it's alive
         try {
-            Http.doHttpGet("https://" + this.host + "/ping", false);
-        } catch (Exception e) {
+            HttpURLConnection connection = (HttpURLConnection) new URL("https://" + this.host + "/ping").openConnection();
+            connection.setRequestMethod("GET");
+            connection.setConnectTimeout(5000);
+            connection.setReadTimeout(5000);
+            connection.connect();
+            if (connection.getResponseCode() != 200 && connection.getResponseCode() != 204) {
+                // If it's a 400, the app is probably outdated. Show a snackbar suggesting user update app and webview
+                if (connection.getResponseCode() == 400) {
+                    // Show a dialog using androidacy_update_needed string
+                    new MaterialAlertDialogBuilder(MainApplication.getINSTANCE())
+                            .setTitle(R.string.androidacy_update_needed)
+                            .setMessage(R.string.androidacy_update_needed_message)
+                            .setPositiveButton(R.string.update, (dialog, which) -> {
+                                // Open the app's page on the Play Store
+                                Intent intent = new Intent(Intent.ACTION_VIEW);
+                                intent.setData(Uri.parse("https://github.com/Fox2Code/FoxMagiskModuleManager/releases/latest"));
+                                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                MainApplication.getINSTANCE().startActivity(intent);
+                            })
+                            .setNegativeButton(R.string.cancel, null)
+                            .show();
+                }
+                return false;
+            }
+        } catch (
+                Exception e) {
             Log.e(TAG, "Failed to ping server", e);
-            // Inform user
-            Looper.prepare();
-            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(MainApplication.getINSTANCE().getBaseContext());
-            builder.setTitle("Androidacy Server Down");
-            builder.setMessage("The Androidacy server is down. Unfortunately, this means that you" +
-                    " will not be able to download or view modules from the Androidacy repository" +
-                    ". Please try again later.");
-            builder.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
-            builder.show();
-            Looper.loop();
             return false;
         }
         String deviceId = generateDeviceId();
         long time = System.currentTimeMillis();
-        if (this.androidacyBlockade > time) return true; // fake it till you make it. Basically,
+        if (this.androidacyBlockade > time)
+            return true; // fake it till you make it. Basically,
         // don'e fail just becaue we're rate limited. API and web rate limits are different.
         this.androidacyBlockade = time + 30_000L;
         try {
@@ -206,7 +229,8 @@ protected boolean prepare() throws NoSuchAlgorithmException {
                 }
                 this.token = null;
             }
-        } catch (IOException e) {
+        } catch (
+                IOException e) {
             if (HttpException.shouldTimeout(e)) {
                 Log.e(TAG, "We are being rate limited!", e);
                 this.androidacyBlockade = time + 3_600_000L;
@@ -222,7 +246,8 @@ protected boolean prepare() throws NoSuchAlgorithmException {
                 try {
                     JSONObject jsonObject = new JSONObject(token);
                     token = jsonObject.getString("token");
-                } catch (JSONException e) {
+                } catch (
+                        JSONException e) {
                     Log.e(TAG, "Failed to parse token", e);
                     // Show a toast
                     Toast.makeText(MainApplication.getINSTANCE(), R.string.androidacy_failed_to_parse_token, Toast.LENGTH_LONG).show();
@@ -239,7 +264,8 @@ protected boolean prepare() throws NoSuchAlgorithmException {
                 SharedPreferences.Editor editor = MainApplication.getINSTANCE().getSharedPreferences("androidacy", 0).edit();
                 editor.putString("pref_androidacy_api_token", token);
                 editor.apply();
-            } catch (Exception e) {
+            } catch (
+                    Exception e) {
                 if (HttpException.shouldTimeout(e)) {
                     Log.e(TAG, "We are being rate limited!", e);
                     this.androidacyBlockade = time + 3_600_000L;
@@ -324,7 +350,8 @@ protected List<RepoModule> populate(JSONObject jsonObject) throws JSONException,
                     moduleInfo.minMagisk = // Allow 24.1 to mean 24100
                             (Integer.parseInt(minMagisk.substring(0, c)) * 1000) + (Integer.parseInt(minMagisk.substring(c + 1)) * 100);
                 }
-            } catch (Exception e) {
+            } catch (
+                    Exception e) {
                 moduleInfo.minMagisk = 0;
             }
             moduleInfo.needRamdisk = jsonObject.optBoolean("needRamdisk", false);
@@ -370,13 +397,13 @@ public boolean tryLoadMetadata(RepoModule repoModule) {
 
     @Override
     public String getUrl() throws NoSuchAlgorithmException {
-        return this.token == null ? this.url :
-                this.url + "?token=" + this.token + "&v=" + BuildConfig.VERSION_CODE + "&c=" + BuildConfig.VERSION_NAME + "&device_id=" + generateDeviceId();
+        return this.token == null ? this.url : this.url + "?token=" + this.token + "&v=" + BuildConfig.VERSION_CODE + "&c=" + BuildConfig.VERSION_NAME + "&device_id=" + generateDeviceId();
     }
 
     private String injectToken(String url) throws NoSuchAlgorithmException {
         // Do not inject token for non Androidacy urls
-        if (!AndroidacyUtil.isAndroidacyLink(url)) return url;
+        if (!AndroidacyUtil.isAndroidacyLink(url))
+            return url;
         if (this.testMode) {
             if (url.startsWith("https://production-api.androidacy.com/")) {
                 Log.e(TAG, "Got non test mode url: " + AndroidacyUtil.hideToken(url));