Fix camelCase naming
This commit is contained in:
1 parent
be761071f8
commit
ead64d3c73
3 files changed
+7
-7
No files matched your search
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user