From 408da749feb23eb3b2f2047b566ec40becb82105 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sat, 21 Mar 2020 16:26:03 +0100 Subject: [PATCH] Fix vibration and fix #745 Signed-off-by: Mario Danic --- app/gplay.gradle | 2 +- .../talk/services/firebase/MagicFirebaseMessagingService.kt | 1 - .../talk/controllers/CallNotificationController.java | 6 +++--- .../java/com/nextcloud/talk/jobs/NotificationWorker.java | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/gplay.gradle b/app/gplay.gradle index d00d66d82..29680af74 100644 --- a/app/gplay.gradle +++ b/app/gplay.gradle @@ -19,5 +19,5 @@ */ dependencies { - implementation "com.google.firebase:firebase-messaging:20.1.0" + implementation "com.google.firebase:firebase-messaging:20.1.2" } diff --git a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt index e528afb90..2878d4ee7 100644 --- a/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt +++ b/app/src/gplay/java/com/nextcloud/talk/services/firebase/MagicFirebaseMessagingService.kt @@ -214,7 +214,6 @@ class MagicFirebaseMessagingService : FirebaseMessagingService() { .setContentIntent(fullScreenPendingIntent) .setFullScreenIntent(fullScreenPendingIntent, true) .setSound(soundUri) - .setVibrate(NotificationUtils.getVibrationEffectForCalls()) .build() notification.flags = notification.flags or Notification.FLAG_INSISTENT isServiceInForeground = true diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index f69a87ad8..1900eb214 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -361,13 +361,13 @@ public class CallNotificationController extends BaseController { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (vibrator.hasAmplitudeControl()) { vibrationEffect = VibrationEffect.createWaveform(vibratePattern, amplitudes, -1); - vibrator.vibrate(vibrationEffect); + //vibrator.vibrate(vibrationEffect); } else { vibrationEffect = VibrationEffect.createWaveform(vibratePattern, -1); - vibrator.vibrate(vibrationEffect); + //vibrator.vibrate(vibrationEffect); } } else { - vibrator.vibrate(vibratePattern, -1); + //vibrator.vibrate(vibratePattern, -1); } } diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java index cbd52aa60..e1949580b 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -546,9 +546,9 @@ public class NotificationWorker extends Worker { if (vibrator != null) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - vibrator.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE)); + //vibrator.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE)); } else { - vibrator.vibrate(500); + //vibrator.vibrate(500); } } }