From a453d42df4808e9dc0cb2a13daec31e12e841137 Mon Sep 17 00:00:00 2001
From: NekoInverter <7741672-NekoInverter@users.noreply.gitlab.com>
Date: Sat, 23 Jan 2021 14:03:11 +0800
Subject: [PATCH] Remove refresh rate check

---
 .../java/com/hippo/ehviewer/Settings.java     | 45 +++++++++----------
 app/src/main/res/xml/advanced_settings.xml    |  2 +-
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java
index 18596701a..5644e1511 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.java
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.java
@@ -20,8 +20,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.util.Log;
-import android.view.Display;
-import android.view.WindowManager;
 
 import androidx.annotation.DimenRes;
 import androidx.annotation.NonNull;
@@ -136,7 +134,7 @@ public class Settings {
     private static final boolean DEFAULT_METERED_NETWORK_WARNING = false;
     private static final String KEY_NIGHT_MODE = "night_mode";
     private static final String DEFAULT_NIGHT_MODE = "-1";
-    private static final String KEY_E_INK_MODE = "e_ink_mode";
+    private static final String KEY_E_INK_MODE = "e_ink_mode_2";
     private static final boolean DEFAULT_E_INK_MODE = false;
     /********************
      ****** Read
@@ -281,34 +279,33 @@ public class Settings {
     }
 
     private static void fixDefaultValue(Context context) {
-        // Enable DoH if the country is CN
-        if (!sSettingsPre.contains(KEY_DOH)) {
-            if ("CN".equals(Locale.getDefault().getCountry())) {
+        if ("CN".equals(Locale.getDefault().getCountry())) {
+            // Enable DoH and domain fronting if the country is CN
+            if (!sSettingsPre.contains(KEY_DOH)) {
                 putDoH(true);
             }
-        }
-        if (!sSettingsPre.contains(KEY_DOMAIN_FRONTING)) {
-            if ("CN".equals(Locale.getDefault().getCountry())) {
+            if (!sSettingsPre.contains(KEY_DOMAIN_FRONTING)) {
                 putDF(true);
             }
-        }
-        // Enable show tag translations if the country is CN
-        if (!sSettingsPre.contains(KEY_SHOW_TAG_TRANSLATIONS)) {
-            if ("CN".equals(Locale.getDefault().getCountry())) {
+            // Enable show tag translations if the country is CN
+            if (!sSettingsPre.contains(KEY_SHOW_TAG_TRANSLATIONS)) {
                 putShowTagTranslations(true);
+
             }
         }
-        if (!sSettingsPre.contains(KEY_E_INK_MODE)) {
-            WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-            if (wm != null) {
-                Display display = wm.getDefaultDisplay();
-                if (display != null && display.getRefreshRate() > 0 && display.getRefreshRate() < 5.0) {
-                    // Probably an E-Ink device
-                    putReadTheme(2);
-                    putEInkMode(true);
-                }
-            }
-        }
+        // Xiaomi (and Huawei?) devices have some kind of "dynamic refresh rate" thing,
+        // which will report a low refresh rate causing false positive reports
+        //if (!sSettingsPre.contains(KEY_E_INK_MODE)) {
+        //    WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        //    if (wm != null) {
+        //        Display display = wm.getDefaultDisplay();
+        //        if (display != null && display.getRefreshRate() > 0 && display.getRefreshRate() < 5.0) {
+        //            // Probably an E-Ink device
+        //            putReadTheme(2);
+        //            putEInkMode(true);
+        //        }
+        //    }
+        //}
     }
 
     private static EhConfig loadEhConfig() {
diff --git a/app/src/main/res/xml/advanced_settings.xml b/app/src/main/res/xml/advanced_settings.xml
index 7594636f0..b6e4d837f 100644
--- a/app/src/main/res/xml/advanced_settings.xml
+++ b/app/src/main/res/xml/advanced_settings.xml
@@ -102,7 +102,7 @@
 
     <SwitchPreferenceCompat
         android:defaultValue="false"
-        android:key="e_ink_mode"
+        android:key="e_ink_mode_2"
         android:summary="@string/settings_e_ink_mode_summary"
         android:title="@string/settings_e_ink_mode_title"
         app:iconSpaceReserved="false" />