diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java index cd5871a92..10b895170 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java @@ -347,8 +347,10 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager, if (currentTime - lastSound > SOUND_DELAY) { boolean sound = settings.getBoolean(PREF_NOTIFY_SOUND, true); String ringtoneUri = settings.get(PREF_NOTIFY_RINGTONE_URI); - if (sound && !StringUtils.isNullOrEmpty(ringtoneUri)) - b.setSound(Uri.parse(ringtoneUri)); + if (sound && !StringUtils.isNullOrEmpty(ringtoneUri)) { + Uri uri = Uri.parse(ringtoneUri); + if (!"file".equals(uri.getScheme())) b.setSound(uri); + } b.setDefaults(getDefaults()); lastSound = currentTime; } @@ -359,7 +361,8 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager, int defaults = DEFAULT_LIGHTS; boolean sound = settings.getBoolean(PREF_NOTIFY_SOUND, true); String ringtoneUri = settings.get(PREF_NOTIFY_RINGTONE_URI); - if (sound && StringUtils.isNullOrEmpty(ringtoneUri)) + if (sound && (StringUtils.isNullOrEmpty(ringtoneUri) || + "file".equals(Uri.parse(ringtoneUri).getScheme()))) defaults |= DEFAULT_SOUND; if (settings.getBoolean(PREF_NOTIFY_VIBRATION, true)) defaults |= DEFAULT_VIBRATE; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index b87e0e4cb..3516342d6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -511,7 +511,12 @@ public class SettingsFragment extends PreferenceFragmentCompat else uri = Uri.parse(ringtoneUri); i.putExtra(EXTRA_RINGTONE_EXISTING_URI, uri); } - startActivityForResult(i, REQUEST_RINGTONE); + if (i.resolveActivity(requireActivity().getPackageManager()) != null) { + startActivityForResult(i, REQUEST_RINGTONE); + } else { + Toast.makeText(getContext(), R.string.cannot_load_ringtone, + LENGTH_SHORT).show(); + } return true; } @@ -646,7 +651,7 @@ public class SettingsFragment extends PreferenceFragmentCompat } else { // The user chose a ringtone other than the default Ringtone r = RingtoneManager.getRingtone(getContext(), uri); - if (r == null) { + if (r == null || "file".equals(uri.getScheme())) { Toast.makeText(getContext(), R.string.cannot_load_ringtone, LENGTH_SHORT).show(); } else {