Do fast forward/reverse on holding down back/next media buttons

3 files changed, 52 insertions, 43 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java b/subsonic-android/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java
index c6861f0a..069345fa 100644
--- a/subsonic-android/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java
+++ b/subsonic-android/src/github/daneren2005/dsub/provider/DSubWidgetProvider.java
@@ -219,19 +219,19 @@ public class DSubWidgetProvider extends AppWidgetProvider {
         // Emulate media button clicks.
         intent = new Intent("1");
         intent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
-        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
+        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
         pendingIntent = PendingIntent.getService(context, 0, intent, 0);
         views.setOnClickPendingIntent(R.id.control_play, pendingIntent);
 
         intent = new Intent("2");  // Use a unique action name to ensure a different PendingIntent to be created.
         intent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
-        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT));
+        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT));
         pendingIntent = PendingIntent.getService(context, 0, intent, 0);
         views.setOnClickPendingIntent(R.id.control_next, pendingIntent);
         
         intent = new Intent("3");  // Use a unique action name to ensure a different PendingIntent to be created.
         intent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
-        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PREVIOUS));
+        intent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PREVIOUS));
         pendingIntent = PendingIntent.getService(context, 0, intent, 0);
         views.setOnClickPendingIntent(R.id.control_previous, pendingIntent);
     }
diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
index 8b37e1e2..68917d9e 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
@@ -223,42 +223,51 @@ public class DownloadServiceLifecycleSupport {
     }
 
     private void handleKeyEvent(KeyEvent event) {
-		if (event.getAction() != KeyEvent.ACTION_DOWN || event.getRepeatCount() > 0) {
-            return;
-        }
-
-        switch (event.getKeyCode()) {
-        case RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE:
-        case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
-        case KeyEvent.KEYCODE_HEADSETHOOK:
-        	downloadService.togglePlayPause();
-        	break;
-        case RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS:
-        case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
-        	downloadService.previous();
-        	break;
-        case RemoteControlClient.FLAG_KEY_MEDIA_NEXT:
-        case KeyEvent.KEYCODE_MEDIA_NEXT:
-        	if (downloadService.getCurrentPlayingIndex() < downloadService.size() - 1) {
-        		downloadService.next();
-        	}
-        	break;
-        case RemoteControlClient.FLAG_KEY_MEDIA_STOP:
-        case KeyEvent.KEYCODE_MEDIA_STOP:
-        	downloadService.stop();
-        	break;
-        case RemoteControlClient.FLAG_KEY_MEDIA_PLAY:
-        case KeyEvent.KEYCODE_MEDIA_PLAY:
-        	if(downloadService.getPlayerState() != PlayerState.STARTED) {
-        		downloadService.start();
-        	}
-        	break;
-        case RemoteControlClient.FLAG_KEY_MEDIA_PAUSE:
-        case KeyEvent.KEYCODE_MEDIA_PAUSE:
-        	downloadService.pause();
-        default:
-        	break;
-        }
+		if(event.getAction() == KeyEvent.ACTION_DOWN && event.getRepeatCount() > 0) {
+			switch (event.getKeyCode()) {
+				case RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS:
+				case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+					downloadService.seekTo(downloadService.getPlayerPosition() - 10000);
+					break;
+				case RemoteControlClient.FLAG_KEY_MEDIA_NEXT:
+				case KeyEvent.KEYCODE_MEDIA_NEXT:
+					downloadService.seekTo(downloadService.getPlayerPosition() + 10000); 
+					break;
+			}
+		} else if(event.getAction() == KeyEvent.ACTION_UP) {
+			switch (event.getKeyCode()) {
+				case RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE:
+				case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+				case KeyEvent.KEYCODE_HEADSETHOOK:
+					downloadService.togglePlayPause();
+					break;
+				case RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS:
+				case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+					downloadService.previous();
+					break;
+				case RemoteControlClient.FLAG_KEY_MEDIA_NEXT:
+				case KeyEvent.KEYCODE_MEDIA_NEXT:
+					if (downloadService.getCurrentPlayingIndex() < downloadService.size() - 1) {
+						downloadService.next();
+					}
+					break;
+				case RemoteControlClient.FLAG_KEY_MEDIA_STOP:
+				case KeyEvent.KEYCODE_MEDIA_STOP:
+					downloadService.stop();
+					break;
+				case RemoteControlClient.FLAG_KEY_MEDIA_PLAY:
+				case KeyEvent.KEYCODE_MEDIA_PLAY:
+					if(downloadService.getPlayerState() != PlayerState.STARTED) {
+						downloadService.start();
+					}
+					break;
+				case RemoteControlClient.FLAG_KEY_MEDIA_PAUSE:
+				case KeyEvent.KEYCODE_MEDIA_PAUSE:
+					downloadService.pause();
+				default:
+					break;
+			}
+		}
     }
 
     /**
diff --git a/subsonic-android/src/github/daneren2005/dsub/util/Util.java b/subsonic-android/src/github/daneren2005/dsub/util/Util.java
index 8fc03879..25226bcd 100644
--- a/subsonic-android/src/github/daneren2005/dsub/util/Util.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/Util.java
@@ -718,26 +718,26 @@ public final class Util {
 		if(playing) {
 			Intent prevIntent = new Intent("KEYCODE_MEDIA_PREVIOUS");
 			prevIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
-			prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PREVIOUS));
+			prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PREVIOUS));
 			pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0);
 			rv.setOnClickPendingIntent(R.id.control_previous, pendingIntent);
 		} else {
 			Intent prevIntent = new Intent("KEYCODE_MEDIA_STOP");
 			prevIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
-			prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_STOP));
+			prevIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_STOP));
 			pendingIntent = PendingIntent.getService(context, 0, prevIntent, 0);
 			rv.setOnClickPendingIntent(R.id.control_previous, pendingIntent);
 		}
         
         Intent pauseIntent = new Intent("KEYCODE_MEDIA_PLAY_PAUSE");
         pauseIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
-        pauseIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
+        pauseIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
         pendingIntent = PendingIntent.getService(context, 0, pauseIntent, 0);
         rv.setOnClickPendingIntent(R.id.control_pause, pendingIntent);
         
         Intent nextIntent = new Intent("KEYCODE_MEDIA_NEXT");
         nextIntent.setComponent(new ComponentName(context, DownloadServiceImpl.class));
-        nextIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT));
+        nextIntent.putExtra(Intent.EXTRA_KEY_EVENT, new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT));
         pendingIntent = PendingIntent.getService(context, 0, nextIntent, 0);
         rv.setOnClickPendingIntent(R.id.control_next, pendingIntent);
     }