From 3cc5eee0ff2d5eb650a71c78235229422322a3a6 Mon Sep 17 00:00:00 2001
From: Tom Hennen <tom.hennen@gmail.com>
Date: Sat, 31 Oct 2015 11:33:10 -0400
Subject: Have a different option for bluetooth reconnect.

Vibrate when starting playback due to bluetooth reconnect.

fixes AntennaPod/AntennaPod#1305
---
 .../core/preferences/UserPreferences.java           |  5 +++++
 .../core/service/playback/PlaybackService.java      | 21 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'core/src/main/java/de/danoeh/antennapod')

diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 006c48b26..84e349535 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -60,6 +60,7 @@ public class UserPreferences {
     // Playback
     public static final String PREF_PAUSE_ON_HEADSET_DISCONNECT = "prefPauseOnHeadsetDisconnect";
     public static final String PREF_UNPAUSE_ON_HEADSET_RECONNECT = "prefUnpauseOnHeadsetReconnect";
+    public static final String PREF_UNPAUSE_ON_BLUETOOTH_RECONNECT = "prefUnpauseOnBluetoothReconnect";
     public static final String PREF_FOLLOW_QUEUE = "prefFollowQueue";
     public static final String PREF_SKIP_KEEPS_EPISODE = "prefSkipKeepsEpisode";
     public static final String PREF_AUTO_DELETE = "prefAutoDelete";
@@ -221,6 +222,10 @@ public class UserPreferences {
         return prefs.getBoolean(PREF_UNPAUSE_ON_HEADSET_RECONNECT, true);
     }
 
+    public static boolean isUnpauseOnBluetoothReconnect() {
+        return prefs.getBoolean(PREF_UNPAUSE_ON_BLUETOOTH_RECONNECT, false);
+    }
+
 
     public static boolean isFollowQueue() {
         return prefs.getBoolean(PREF_FOLLOW_QUEUE, true);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 5cef2fe79..ab78387a2 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -18,6 +18,7 @@ import android.media.MediaPlayer;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
+import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
@@ -531,7 +532,7 @@ public class PlaybackService extends Service {
 
         @Override
         public boolean onMediaPlayerError(Object inObj, int what, int extra) {
-            final String TAG = "PlaybackService.onErrorListener";
+            final String TAG = "PlaybackSvc.onErrorLtsn";
             Log.w(TAG, "An error has occured: " + what + " " + extra);
             if (mediaPlayer.getPlayerStatus() == PlayerStatus.PLAYING) {
                 mediaPlayer.pause(true, false);
@@ -1022,7 +1023,7 @@ public class PlaybackService extends Service {
                         pauseIfPauseOnDisconnect();
                     } else if (state == PLUGGED) {
                         Log.d(TAG, "Headset was plugged in during playback.");
-                        unpauseIfPauseOnDisconnect();
+                        unpauseIfPauseOnDisconnect(false);
                     }
                 } else {
                     Log.e(TAG, "Received invalid ACTION_HEADSET_PLUG intent");
@@ -1038,7 +1039,7 @@ public class PlaybackService extends Service {
                 int state = intent.getIntExtra(BluetoothA2dp.EXTRA_STATE, -1);
                 if (state == BluetoothA2dp.STATE_CONNECTED) {
                     Log.d(TAG, "Received bluetooth connection intent");
-                    unpauseIfPauseOnDisconnect();
+                    unpauseIfPauseOnDisconnect(true);
                 }
             }
         }
@@ -1071,10 +1072,20 @@ public class PlaybackService extends Service {
         }
     }
 
-    private void unpauseIfPauseOnDisconnect() {
+    /**
+     * @param bluetooth true if the event for unpausing came from bluetooth
+     */
+    private void unpauseIfPauseOnDisconnect(boolean bluetooth) {
         if (transientPause) {
             transientPause = false;
-            if (UserPreferences.isPauseOnHeadsetDisconnect() && UserPreferences.isUnpauseOnHeadsetReconnect()) {
+            if (!bluetooth && UserPreferences.isUnpauseOnHeadsetReconnect()) {
+                mediaPlayer.resume();
+            } else if (bluetooth && UserPreferences.isUnpauseOnBluetoothReconnect()){
+                // let the user know we've started playback again...
+                Vibrator v = (Vibrator) getApplicationContext().getSystemService(Context.VIBRATOR_SERVICE);
+                if(v != null) {
+                    v.vibrate(500);
+                }
                 mediaPlayer.resume();
             }
         }
-- 
cgit v1.2.3