Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 02:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow ringer to ring in certain dnd situations.

Browse Source
This commit is contained in:
Alex Hart
2024-03-14 17:43:03 -03:00
committed by Cody Henthorne
parent 02c0d3ed6e
commit 61cfbd6852
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
package org.thoughtcrime.securesms.webrtc.audio;
import android.app.NotificationManager;
import android.content.Context;
import android.media.AudioAttributes;
import android.media.AudioManager;
@@ -35,7 +36,6 @@ public class IncomingRinger {
}
public void start(@Nullable Uri uri, boolean vibrate) {
AudioManager audioManager = ServiceUtil.getAudioManager(context);
if (player != null) {
player.release();
@@ -45,7 +45,7 @@ public class IncomingRinger {
player = createPlayer(uri);
}
int ringerMode = audioManager.getRingerMode();
int ringerMode = getAudioManagerRingMode();
if (shouldVibrate(context, player, ringerMode, vibrate)) {
Log.i(TAG, "Starting vibration");
@@ -83,6 +83,27 @@ public class IncomingRinger {
vibrator.cancel();
}
/**
* Overrides the ringer mode if we are on the right API level and have the right policy access.
* Checks the ringer volume to make sure we're not going to blast someone with their ringtone inadvertently.
* Safe to do because at this point, we've already checked the policy for the given incoming call peer.
*/
private int getAudioManagerRingMode() {
AudioManager audioManager = ServiceUtil.getAudioManager(context);
NotificationManager notificationManager = ServiceUtil.getNotificationManager(context);
int ringerMode = audioManager.getRingerMode();
if (Build.VERSION.SDK_INT >= 28 && !notificationManager.isNotificationPolicyAccessGranted()) {
int ringVolume = audioManager.getStreamVolume(AudioManager.STREAM_RING);
if (ringVolume > 0 && ringerMode == AudioManager.RINGER_MODE_SILENT) {
return AudioManager.RINGER_MODE_NORMAL;
}
}
return ringerMode;
}
private boolean shouldVibrate(Context context, MediaPlayer player, int ringerMode, boolean vibrate) {
if (player == null) {
return true;