sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

consume volume down event

This commit is contained in:
Daniel Gultsch 2021-02-18 22:16:28 +01:00
parent 484f633180
commit ebb38d7d75
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/services/NotificationService.java
View File

@ -498,17 +498,21 @@ public class NotificationService {
cancel(INCOMING_CALL_NOTIFICATION_ID); cancel(INCOMING_CALL_NOTIFICATION_ID);
} }
public void stopSoundAndVibration() { public boolean stopSoundAndVibration() {
int stopped = 0;
if (this.currentlyPlayingRingtone != null) { if (this.currentlyPlayingRingtone != null) {
if (this.currentlyPlayingRingtone.isPlaying()) { if (this.currentlyPlayingRingtone.isPlaying()) {
Log.d(Config.LOGTAG, "stop playing ring tone"); Log.d(Config.LOGTAG, "stop playing ring tone");
++stopped;
} }
this.currentlyPlayingRingtone.stop(); this.currentlyPlayingRingtone.stop();
} }
if (this.vibrationFuture != null && !this.vibrationFuture.isCancelled()) { if (this.vibrationFuture != null && !this.vibrationFuture.isCancelled()) {
Log.d(Config.LOGTAG, "cancel vibration"); Log.d(Config.LOGTAG, "stop vibration");
this.vibrationFuture.cancel(true); this.vibrationFuture.cancel(true);
++stopped;
} }
return stopped > 0;
} }
public static void cancelIncomingCallNotification(final Context context) { public static void cancelIncomingCallNotification(final Context context) {

4
src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
View File

@ -151,7 +151,9 @@ public class RtpSessionActivity extends XmppActivity implements XmppConnectionSe
public boolean onKeyDown(final int keyCode, final KeyEvent event) { public boolean onKeyDown(final int keyCode, final KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN){ if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN){
if (xmppConnectionService != null) { if (xmppConnectionService != null) {
xmppConnectionService.getNotificationService().stopSoundAndVibration(); if (xmppConnectionService.getNotificationService().stopSoundAndVibration()) {
return true;
}
} }
} }
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);