diff --git a/mobile/build.gradle b/mobile/build.gradle index 2ddd31b8..2fda36e9 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -78,9 +78,9 @@ dependencies { implementation 'androidx.emoji:emoji:1.0.0' implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion" - implementation 'androidx.preference:preference:1.1.0-alpha03' + implementation 'androidx.preference:preference:1.1.0-alpha04' implementation "androidx.room:room-coroutines:$roomVersion" - implementation 'com.android.billingclient:billing:1.2.1' + implementation 'com.android.billingclient:billing:1.2.2' implementation 'com.github.luongvo:BadgeView:1.1.5' implementation 'com.github.topjohnwu.libsu:core:2.3.1' implementation 'com.google.android.material:material:1.0.0' diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt index ea66d705..5a4faf26 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt @@ -29,7 +29,7 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() { preferenceManager.preferenceDataStore = SharedPreferenceDataStore(app.pref) RoutingManager.masqueradeMode = RoutingManager.masqueradeMode // flush default value addPreferencesFromResource(R.xml.pref_settings) - val boot = findPreference("service.repeater.startOnBoot") as SwitchPreference + val boot = findPreference("service.repeater.startOnBoot")!! if (RepeaterService.supported) { boot.setOnPreferenceChangeListener { _, value -> BootReceiver.enabled = value as Boolean @@ -37,15 +37,15 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() { } boot.isChecked = BootReceiver.enabled } else boot.parent!!.removePreference(boot) - findPreference("service.clean").setOnPreferenceClickListener { + findPreference("service.clean")!!.setOnPreferenceClickListener { RoutingManager.clean() true } - findPreference(IpMonitor.KEY).setOnPreferenceChangeListener { _, _ -> + findPreference(IpMonitor.KEY)!!.setOnPreferenceChangeListener { _, _ -> SmartSnackbar.make(R.string.settings_restart_required).show() true } - findPreference("misc.logcat").setOnPreferenceClickListener { + findPreference("misc.logcat")!!.setOnPreferenceClickListener { val context = requireContext() val logDir = File(context.cacheDir, "log") logDir.mkdir() @@ -107,11 +107,11 @@ class SettingsPreferenceFragment : PreferenceFragmentCompat() { getString(R.string.abc_shareactionprovider_share_with))) true } - findPreference("misc.source").setOnPreferenceClickListener { + findPreference("misc.source")!!.setOnPreferenceClickListener { requireContext().launchUrl("https://github.com/Mygod/VPNHotspot/blob/master/README.md") true } - findPreference("misc.donate").setOnPreferenceClickListener { + findPreference("misc.donate")!!.setOnPreferenceClickListener { EBegFragment().show(fragmentManager ?: return@setOnPreferenceClickListener false, "EBegFragment") true }