From 8c87c5b45d4ed9d22f2b3c379adb9f0ff45ee0f4 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 14 Oct 2021 18:28:19 +0200 Subject: [PATCH] remove unused vibrate code Signed-off-by: Andy Scherzinger --- .../CallNotificationController.java | 32 ------------------- .../talk/jobs/NotificationWorker.java | 11 ------- 2 files changed, 43 deletions(-) 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 6a24e7c28..dc8f1bfee 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -29,10 +29,8 @@ import android.graphics.drawable.ColorDrawable; import android.media.AudioAttributes; import android.media.MediaPlayer; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; -import android.os.VibrationEffect; import android.os.Vibrator; import android.renderscript.RenderScript; import android.text.TextUtils; @@ -357,8 +355,6 @@ public class CallNotificationController extends BaseController { if (DoNotDisturbUtils.INSTANCE.shouldPlaySound()) { playRingtoneSound(); } - - vibrate(); } @Subscribe(threadMode = ThreadMode.MAIN) @@ -527,32 +523,4 @@ public class CallNotificationController extends BaseController { } } } - - private void vibrate() { - vibrator = (Vibrator) getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE); - - if (vibrator != null) { - long[] vibratePattern = new long[]{0, 400, 800, 600, 800, 800, 800, 1000}; - int[] amplitudes = new int[]{0, 255, 0, 255, 0, 255, 0, 255}; - - VibrationEffect vibrationEffect; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - if (vibrator.hasAmplitudeControl()) { - vibrationEffect = VibrationEffect.createWaveform(vibratePattern, amplitudes, -1); - //vibrator.vibrate(vibrationEffect); - } else { - vibrationEffect = VibrationEffect.createWaveform(vibratePattern, -1); - //vibrator.vibrate(vibrationEffect); - } - } else { - //vibrator.vibrate(vibratePattern, -1); - } - } - - handler.postDelayed(() -> { - if (vibrator != null) { - vibrator.cancel(); - } - }, 10000); - } } \ No newline at end of file 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 74496da80..d11134a45 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -32,7 +32,6 @@ import android.media.MediaPlayer; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Vibrator; import android.service.notification.StatusBarNotification; import android.text.TextUtils; import android.util.Base64; @@ -536,16 +535,6 @@ public class NotificationWorker extends Worker { Log.e(TAG, "Failed to set data source"); } } - - Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE); - if (vibrator != null) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - //vibrator.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE)); - } else { - //vibrator.vibrate(500); - } - } - } }