Add Dns Over Https switch. (Close #5)

Author: Fox2Code

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

@@ -106,6 +106,10 @@ public static boolean isTextWrapEnabled() {
         return getSharedPreferences().getBoolean("pref_wrap_text", false);
     }
 
+    public static boolean isDohEnabled() {
+        return getSharedPreferences().getBoolean("pref_dns_over_https", true);
+    }
+
     public static boolean isDeveloper() {
         return BuildConfig.DEBUG ||
                 getSharedPreferences().getBoolean("developer", false);

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

@@ -21,7 +21,6 @@
 
 interface NotificationTypeCst {
     String TAG = "NotificationType";
-    boolean ROOTLESS_TEST = true;
 }
 
 public enum NotificationType implements NotificationTypeCst {
@@ -110,7 +109,7 @@ public boolean shouldRemove() {
     }, true) {
         @Override
         public boolean shouldRemove() {
-            return (!(ROOTLESS_TEST && BuildConfig.DEBUG)) &&
+            return !BuildConfig.DEBUG &&
                     (MainApplication.isShowcaseMode() ||
                             InstallerInitializer.peekMagiskPath() == null);
         }
@@ -135,11 +134,13 @@ public boolean shouldRemove() {
         this(textId, iconId, backgroundAttr, foregroundAttr, null);
     }
 
-    NotificationType(@StringRes int textId, int iconId, int backgroundAttr, int foregroundAttr, View.OnClickListener onClickListener) {
-        this(textId, iconId, backgroundAttr, foregroundAttr, null, false);
+    NotificationType(@StringRes int textId, int iconId, int backgroundAttr, int foregroundAttr,
+                     View.OnClickListener onClickListener) {
+        this(textId, iconId, backgroundAttr, foregroundAttr, onClickListener, false);
     }
 
-    NotificationType(@StringRes int textId, int iconId, int backgroundAttr, int foregroundAttr, View.OnClickListener onClickListener, boolean special) {
+    NotificationType(@StringRes int textId, int iconId, int backgroundAttr, int foregroundAttr,
+                     View.OnClickListener onClickListener, boolean special) {
         this.textId = textId;
         this.iconId = iconId;
         this.backgroundAttr = backgroundAttr;

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

@@ -107,6 +107,8 @@ protected List<RepoModule> populate(JSONObject jsonObject) throws JSONException
         for (int i = 0; i < len; i++) {
             jsonObject = jsonArray.getJSONObject(i);
             String moduleId = jsonObject.getString("codename");
+            // Deny remote modules ids shorter than 3 chars
+            if (moduleId.length() < 3) continue;
             long lastUpdate = jsonObject.getLong("updated_at") * 1000;
             lastLastUpdate = Math.max(lastLastUpdate, lastUpdate);
             RepoModule repoModule = this.moduleHashMap.get(moduleId);

app/src/main/java/com/fox2code/mmm/repo/RepoData.java

@@ -85,8 +85,8 @@ protected List<RepoModule> populate(JSONObject jsonObject) throws JSONException
             for (int i = 0; i < len; i++) {
                 JSONObject module = array.getJSONObject(i);
                 String moduleId = module.getString("id");
-                // Deny remote modules ids shorter than 3 chars long or that start with a digit
-                if (moduleId.length() < 3 || Character.isDigit(moduleId.charAt(0))) continue;
+                // Deny remote modules ids shorter than 3 chars
+                if (moduleId.length() < 3) continue;
                 long moduleLastUpdate = module.getLong("last_update");
                 String moduleNotesUrl = module.getString("notes_url");
                 String modulePropsUrl = module.getString("prop_url");

app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java

@@ -23,6 +23,7 @@
 import com.fox2code.mmm.installer.InstallerInitializer;
 import com.fox2code.mmm.repo.RepoData;
 import com.fox2code.mmm.repo.RepoManager;
+import com.fox2code.mmm.utils.Http;
 import com.fox2code.mmm.utils.IntentHelper;
 import com.mikepenz.aboutlibraries.LibsBuilder;
 import com.topjohnwu.superuser.internal.UiThreadHandler;
@@ -83,6 +84,10 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 }
                 return true;
             });
+            findPreference("pref_dns_over_https").setOnPreferenceChangeListener((p, v) -> {
+                Http.setDoh((Boolean) v);
+                return true;
+            });
             if ("dark".equals(themePreference.getValue())) {
                 findPreference("pref_force_dark_terminal").setEnabled(false);
             }

app/src/main/java/com/fox2code/mmm/utils/Http.java

@@ -52,9 +52,12 @@
 public class Http {
     private static final String TAG = "Http";
     private static final OkHttpClient httpClient;
+    private static final OkHttpClient httpClientDoH;
     private static final OkHttpClient httpClientWithCache;
+    private static final OkHttpClient httpClientWithCacheDoH;
     private static final FallBackDNS fallbackDNS;
     private static final String androidacyUA;
+    private static boolean doh;
 
     static {
         MainApplication mainApplication = MainApplication.getINSTANCE();
@@ -131,26 +134,33 @@ public class Http {
             return chain.proceed(request.build());
         });
         // Fallback DNS cache responses in case request fail but already succeeded once in the past
-        httpclientBuilder.dns(fallbackDNS = new FallBackDNS(mainApplication, dns,
+        fallbackDNS = new FallBackDNS(mainApplication, dns,
                 "github.com", "api.github.com", "raw.githubusercontent.com",
                 "camo.githubusercontent.com", "user-images.githubusercontent.com",
                 "cdn.jsdelivr.net", "img.shields.io", "magisk-modules-repo.github.io",
-                "www.androidacy.com", "api.androidacy.com"));
+                "www.androidacy.com", "api.androidacy.com");
         httpclientBuilder.cookieJar(new CDNCookieJar(true));
+        httpclientBuilder.dns(Dns.SYSTEM);
         httpClient = httpclientBuilder.build();
+        httpclientBuilder.dns(fallbackDNS);
+        httpClientDoH = httpclientBuilder.build();
         httpclientBuilder.cache(new Cache(
                 new File(mainApplication.getCacheDir(), "http_cache"),
                 16L * 1024L * 1024L)); // 16Mib of cache
+        httpclientBuilder.dns(Dns.SYSTEM);
         httpClientWithCache = httpclientBuilder.build();
+        httpclientBuilder.dns(fallbackDNS);
+        httpClientWithCacheDoH = httpclientBuilder.build();
         Log.i(TAG, "Initialized Http successfully!");
+        doh = MainApplication.isDohEnabled();
     }
 
     public static OkHttpClient getHttpClient() {
-        return httpClient;
+        return doh ? httpClientDoH : httpClient;
     }
 
     public static OkHttpClient getHttpClientWithCache() {
-        return httpClientWithCache;
+        return doh ? httpClientWithCacheDoH : httpClientWithCache;
     }
 
     public static byte[] doHttpGet(String url,boolean allowCache) throws IOException {
@@ -241,6 +251,11 @@ public static String getAndroidacyUA() {
         return androidacyUA;
     }
 
+    public static void setDoh(boolean doh) {
+        Log.d(TAG, "DoH: " + Http.doh + " -> " + doh);
+        Http.doh = doh;
+    }
+
     /**
      * Cookie jar that allow CDN cookies, reset on app relaunch
      * Note: An argument can be made that it allow tracking but

app/src/main/res/drawable/ic_baseline_security_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
+</vector>

app/src/main/res/values/strings.xml

@@ -74,7 +74,10 @@
         and/or indicating poor module quality, disable at your own risk!
     </string>
     <string name="dns_over_https_pref">Dns over https</string>
-    <string name="dns_over_https_desc">May fix connections issues in some cases.</string>
+    <string name="dns_over_https_desc">
+        May fix connections issues in some cases.
+        (Does not apply to WebView)
+    </string>
     <string name="disable_extensions_pref">Disable extensions</string>
     <string name="disable_extensions_desc">
         Disable Fox\'s Mmm extensions, this prevent modules from using

app/src/main/res/xml/root_preferences.xml

@@ -71,6 +71,14 @@
             app:title="@string/use_magisk_install_command_pref"
             app:summary="@string/use_magisk_install_command_desc"
             app:singleLineTitle="false"	/>
+
+        <SwitchPreferenceCompat
+            app:defaultValue="true"
+            app:key="pref_dns_over_https"
+            app:icon="@drawable/ic_baseline_security_24"
+            app:title="@string/dns_over_https_pref"
+            app:summary="@string/dns_over_https_desc"
+            app:singleLineTitle="false"	/>
     </PreferenceCategory>
 
     <PreferenceCategory