Browse Source

Merge pull request #1650 from nextcloud/bugfix/noid/housekeepingVibrateAway

Cleanup code after custom vibrate code removal
Andy Scherzinger 3 years ago
parent
commit
888a7f2b78

+ 2 - 8
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java

@@ -31,7 +31,6 @@ import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Vibrator;
 import android.renderscript.RenderScript;
 import android.text.TextUtils;
 import android.util.Log;
@@ -149,7 +148,6 @@ public class CallNotificationController extends BaseController {
     private MediaPlayer mediaPlayer;
     private boolean leavingScreen = false;
     private RenderScript renderScript;
-    private Vibrator vibrator;
     private Handler handler;
 
     public CallNotificationController(Bundle args) {
@@ -443,7 +441,7 @@ public class CallNotificationController extends BaseController {
         }
     }
 
-    private void endMediaAndVibratorNotifications() {
+    private void endMediaNotifications() {
         if (mediaPlayer != null) {
             if (mediaPlayer.isPlaying()) {
                 mediaPlayer.stop();
@@ -452,10 +450,6 @@ public class CallNotificationController extends BaseController {
             mediaPlayer.release();
             mediaPlayer = null;
         }
-
-        if (vibrator != null) {
-            vibrator.cancel();
-        }
     }
 
     @Override
@@ -467,7 +461,7 @@ public class CallNotificationController extends BaseController {
             handler = null;
         }
         dispose();
-        endMediaAndVibratorNotifications();
+        endMediaNotifications();
         super.onDestroy();
     }