Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update incoming call handling.

Browse Source 
* Fix crash with incoming ringer when custom ringtone isn't found.
* Stop notification profiles from terminating calls on linked devices.
This commit is contained in:
Cody Henthorne
2022-06-13 09:57:56 -04:00
committed by Greyson Parrelli
parent 5df20d755a
commit ce93537fee
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
View File

@@ -134,21 +134,19 @@ public class IncomingRinger {
MediaPlayer mediaPlayer = new MediaPlayer();
mediaPlayer.setDataSource(context, ringtoneUri);
return mediaPlayer;
} catch (SecurityException e) {
} catch (IOException | SecurityException e) {
Log.w(TAG, "Failed to create player with ringtone the normal way", e);
}
if (ringtoneUri.equals(Settings.System.DEFAULT_RINGTONE_URI)) {
try {
Uri defaultRingtoneUri = RingtoneUtil.getActualDefaultRingtoneUri(context);
if (defaultRingtoneUri != null) {
MediaPlayer mediaPlayer = new MediaPlayer();
mediaPlayer.setDataSource(context, defaultRingtoneUri);
return mediaPlayer;
}
} catch (SecurityException e) {
Log.w(TAG, "Failed to set default ringtone with fallback approach", e);
try {
Uri defaultRingtoneUri = RingtoneUtil.getActualDefaultRingtoneUri(context);
if (defaultRingtoneUri != null) {
MediaPlayer mediaPlayer = new MediaPlayer();
mediaPlayer.setDataSource(context, defaultRingtoneUri);
return mediaPlayer;
}
} catch (SecurityException e) {
Log.w(TAG, "Failed to set default ringtone with fallback approach", e);
}
return null;