Skip to content

Commit 18ac05e

Browse files
committed
Fix crashes when entering settings
Likely from #209
1 parent 02f6882 commit 18ac05e

File tree

3 files changed

+7
-35
lines changed

3 files changed

+7
-35
lines changed

app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt

-12
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import android.os.Bundle
44
import android.view.View
55
import androidx.annotation.Keep
66
import androidx.fragment.app.viewModels
7-
import androidx.preference.Preference
87
import com.google.android.material.snackbar.Snackbar
98
import dagger.hilt.android.AndroidEntryPoint
109
import eu.darken.capod.R
@@ -27,17 +26,6 @@ class SupportFragment : PreferenceFragment3() {
2726

2827
@Inject lateinit var clipboardHelper: ClipboardHelper
2928

30-
private val installIdPref by lazy { findPreference<Preference>("support.installid")!! }
31-
32-
override fun onPreferencesCreated() {
33-
installIdPref.setOnPreferenceClickListener {
34-
vm.copyInstallID()
35-
true
36-
}
37-
38-
super.onPreferencesCreated()
39-
}
40-
4129
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
4230
vm.clipboardEvent.observe2(this) { installId ->
4331
Snackbar.make(requireView(), installId, Snackbar.LENGTH_INDEFINITE)

app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsFragment.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import android.view.View
55
import androidx.annotation.Keep
66
import androidx.fragment.app.viewModels
77
import androidx.lifecycle.asLiveData
8-
import androidx.preference.CheckBoxPreference
98
import androidx.preference.ListPreference
109
import androidx.preference.Preference
10+
import androidx.preference.TwoStatePreference
1111
import dagger.hilt.android.AndroidEntryPoint
1212
import eu.darken.capod.R
1313
import eu.darken.capod.common.bluetooth.BluetoothDevice2
@@ -51,17 +51,17 @@ class ReactionSettingsFragment : PreferenceFragment3() {
5151

5252
override fun onPreferenceTreeClick(preference: Preference): Boolean {
5353
if (preference.key == reactionSettings.autoPlay.key && !isPro) {
54-
preference as CheckBoxPreference
54+
preference as TwoStatePreference
5555
upgradeRepo.launchBillingFlow(requireActivity())
5656
preference.isChecked = false
5757
return true
5858
} else if (preference.key == reactionSettings.autoPause.key && !isPro) {
59-
preference as CheckBoxPreference
59+
preference as TwoStatePreference
6060
upgradeRepo.launchBillingFlow(requireActivity())
6161
preference.isChecked = false
6262
return true
6363
} else if (preference.key == reactionSettings.autoConnect.key) {
64-
preference as CheckBoxPreference
64+
preference as TwoStatePreference
6565

6666
if (!isPro) {
6767
upgradeRepo.launchBillingFlow(requireActivity())
@@ -79,12 +79,12 @@ class ReactionSettingsFragment : PreferenceFragment3() {
7979
return true
8080
}
8181
} else if (preference.key == reactionSettings.showPopUpOnCaseOpen.key && !isPro) {
82-
preference as CheckBoxPreference
82+
preference as TwoStatePreference
8383
upgradeRepo.launchBillingFlow(requireActivity())
8484
preference.isChecked = false
8585
return true
8686
} else if (preference.key == reactionSettings.showPopUpOnConnection.key && !isPro) {
87-
preference as CheckBoxPreference
87+
preference as TwoStatePreference
8888
upgradeRepo.launchBillingFlow(requireActivity())
8989
preference.isChecked = false
9090
return true
+1-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto">
2+
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
43
<eu.darken.capod.common.preferences.IntentPreference
54
android:icon="@drawable/ic_discord_onsurface"
65
android:summary="@string/discord_description"
@@ -18,19 +17,4 @@
1817
android:data="https://github.com/d4rken-org/capod/issues" />
1918
</eu.darken.capod.common.preferences.IntentPreference>
2019

21-
<!-- Hide Install-ID and bug reporting settings, but keep for possible use in the future.
22-
<PreferenceCategory app:title="@string/settings_category_other_label">
23-
<Preference
24-
android:icon="@drawable/ic_id_onsurface"
25-
android:key="support.installid"
26-
android:summary="@string/settings_support_installid_desc"
27-
android:title="@string/settings_support_installid_label" />
28-
29-
<CheckBoxPreference
30-
android:icon="@drawable/ic_spider_thread_onsurface"
31-
android:key="debug.bugreport.automatic.enabled"
32-
android:summary="@string/settings_debug_autoreports_description"
33-
android:title="@string/settings_debug_autoreports_label" />
34-
</PreferenceCategory>
35-
-->
3620
</PreferenceScreen>

0 commit comments

Comments
 (0)