As of 'N' we can no longer offer external ringtone selection

1. Replace custom ringtone picker with system Intent, since we
   don't need it anymore. Fixes #7174

2. Make sure 'silent' ringtone selection is stored appropriately
   Fixes #7115 Closes #7141

3. Replace any existing file:// notification URIs with the system
   default Fixes #7234
This commit is contained in:
Moxie Marlinspike
2017-12-01 12:55:24 -08:00
parent 4cb2ac7b27
commit 3523952ef9
11 changed files with 99 additions and 1129 deletions

View File

@@ -9,11 +9,11 @@
android:title="@string/preferences__notifications"
android:defaultValue="true" />
<org.thoughtcrime.securesms.preferences.widgets.SignalRingtonePreference
<org.thoughtcrime.securesms.preferences.widgets.SignalPreference
android:dependency="pref_key_enable_notifications"
android:key="pref_key_ringtone"
android:title="@string/preferences__sound"
android:ringtoneType="notification"
android:persistent="false"
android:defaultValue="content://settings/system/notification_sound" />
<org.thoughtcrime.securesms.components.SwitchPreferenceCompat

View File

@@ -10,13 +10,10 @@
android:disableDependentsState="true"
android:persistent="false" />
<org.thoughtcrime.securesms.preferences.widgets.SignalRingtonePreference
<org.thoughtcrime.securesms.preferences.widgets.SignalPreference
android:dependency="pref_key_recipient_mute"
android:key="pref_key_recipient_ringtone"
android:title="@string/recipient_preferences__notification_sound"
android:ringtoneType="notification"
android:showSilent="true"
android:showDefault="true"
android:persistent="false"/>
<org.thoughtcrime.securesms.preferences.widgets.SignalListPreference