From 86b6ec2ddef048fb3e7950a9c3d944ec0833bf09 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 10 May 2020 21:22:37 +0200 Subject: [PATCH] Fix #831 Signed-off-by: Mario Danic --- .../java/com/nextcloud/talk/jobs/NotificationWorker.kt | 2 +- .../java/com/nextcloud/talk/utils/NotificationUtils.kt | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt index 088ce2042..63b5b3a64 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt @@ -286,7 +286,7 @@ class NotificationWorker( .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION) .setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT) - val vibrationEffect = NotificationUtils.getVibrationEffect(appPreferences) + val vibrationEffect = NotificationUtils.getVibrationEffect(appPreferences, false) val notificationChannelId = NotificationUtils.getNotificationChannelId(applicationContext, applicationContext.resources .getString(R.string.nc_notification_channel_messages), applicationContext.resources diff --git a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt index 48a0f95f8..c5180107f 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/NotificationUtils.kt @@ -93,10 +93,14 @@ object NotificationUtils { } } - fun getVibrationEffect(appPreferences: AppPreferences): LongArray? { + fun getVibrationEffect(appPreferences: AppPreferences, forCalls: Boolean = true): LongArray? { val vibrator = getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE) as Vibrator return if (appPreferences.shouldVibrateSetting && vibrator.hasVibrator()) { - longArrayOf(0L, 400L, 800L, 600L, 800L, 800L, 800L, 1000L) + if (forCalls) { + longArrayOf(0L, 400L, 800L, 600L, 800L, 800L, 800L, 1000L) + } else { + longArrayOf(0L, 100L, 1000L) + } } else { null }