Fix call ringtone not playing on some custom ROMs and Samsung Android 11 devices.

This commit is contained in:
Cody Henthorne
2021-03-26 12:58:17 -04:00
committed by Alex Hart
parent 243b4b9414
commit 2144dc3b67
5 changed files with 176 additions and 25 deletions

View File

@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.notifications.NotificationChannels;
import org.thoughtcrime.securesms.util.RingtoneUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import static android.app.Activity.RESULT_OK;
@@ -165,10 +166,12 @@ public class NotificationsPreferenceFragment extends ListSummaryPreferenceFragme
if (value == null || TextUtils.isEmpty(value.toString())) {
preference.setSummary(R.string.preferences__silent);
} else {
Ringtone tone = RingtoneManager.getRingtone(getActivity(), value);
Ringtone tone = RingtoneUtil.getRingtone(requireContext(), value);
if (tone != null) {
preference.setSummary(tone.getTitle(getActivity()));
} else {
preference.setSummary(R.string.preferences__default);
}
}