From ead64d3c73d939cb4f7d01d74e230976c826213f Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 7 Feb 2023 15:24:25 +0800
Subject: [PATCH] Fix camelCase naming

---
 app/src/main/java/com/hippo/ehviewer/Settings.java          | 2 +-
 app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt     | 6 +++---
 .../java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/Settings.java b/app/src/main/java/com/hippo/ehviewer/Settings.java
index 055287f5f..bb7209c01 100755
--- a/app/src/main/java/com/hippo/ehviewer/Settings.java
+++ b/app/src/main/java/com/hippo/ehviewer/Settings.java
@@ -675,7 +675,7 @@ public class Settings {
         putBoolean(KEY_DOMAIN_FRONTING, value);
     }
 
-    public static boolean getBypassVPN() {
+    public static boolean getBypassVpn() {
         return getBoolean(KEY_BYPASS_VPN, DEFAULT_BYPASS_VPN);
     }
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
index c0a4848e6..c4a372920 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.kt
@@ -208,8 +208,8 @@ class MainActivity : EhActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         connectivityManager = getSystemService()!!
-        if (Settings.getDF() && Settings.getBypassVPN()) {
-            bypassVPN()
+        if (Settings.getDF() && Settings.getBypassVpn()) {
+            bypassVpn()
         }
         if (EhUtils.needSignedIn())
             startActivity(Intent(this, LoginActivity::class.java))
@@ -270,7 +270,7 @@ class MainActivity : EhActivity() {
         }
     }
 
-    private fun bypassVPN() {
+    private fun bypassVpn() {
         val network = connectivityManager.activeNetwork
         val capabilities = connectivityManager.getNetworkCapabilities(network)
         capabilities?.let {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
index e50b43da5..ccf2c085e 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.kt
@@ -237,7 +237,7 @@ class AdvancedFragment : BasePreferenceFragment() {
         val backupFavorite = findPreference<Preference>(KEY_BACKUP_FAVORITE)
         val openByDefault = findPreference<Preference>(KEY_OPEN_BY_DEFAULT)
         val domainFronting = findPreference<Preference>(AppSettings.KEY_DOMAIN_FRONTING)
-        val bypassVPN = findPreference<Preference>(AppSettings.KEY_BYPASS_VPN)
+        val bypassVpn = findPreference<Preference>(AppSettings.KEY_BYPASS_VPN)
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
             openByDefault!!.isVisible = false
         } else {
@@ -248,9 +248,9 @@ class AdvancedFragment : BasePreferenceFragment() {
         exportData!!.onPreferenceClickListener = this
         backupFavorite!!.onPreferenceClickListener = this
         appLanguage!!.onPreferenceChangeListener = this
-        bypassVPN!!.isVisible = AppSettings.getDF()
+        bypassVpn!!.isVisible = AppSettings.getDF()
         domainFronting!!.setOnPreferenceChangeListener { _, newValue ->
-            bypassVPN.isVisible = newValue as Boolean
+            bypassVpn.isVisible = newValue as Boolean
             true
         }
     }