Fixed listeners, so now they run on UI thread.

PaulWoitaschek · Aug 27, 2014 · 2222e93 · 2222e93
1 parent 103c59b
commit 2222e93
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 42 deletions.
diff --git a/audiobook/src/main/java/de/ph1b/audiobook/dialog/SleepDialog.java b/audiobook/src/main/java/de/ph1b/audiobook/dialog/SleepDialog.java
@@ -54,15 +54,11 @@ public void onClick(DialogInterface dialog, int id) {
                 Intent serviceIntent = new Intent(context, AudioPlayerService.class);
                 serviceIntent.setAction(AudioPlayerService.CONTROL_SLEEP);
                 serviceIntent.putExtra(AudioPlayerService.CONTROL_SLEEP, mPicker.getValue() * 60 * 1000);
-                context.startService(serviceIntent);
-            }
-        });
-        builder.setNegativeButton(R.string.choose_time_cancel, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
 
+                context.startService(serviceIntent);
             }
         });
+        builder.setNegativeButton(R.string.choose_time_cancel, null);
         builder.setTitle(R.string.action_sleep_title);
 
         return builder.create();

diff --git a/audiobook/src/main/java/de/ph1b/audiobook/fragment/BookChooseFragment.java b/audiobook/src/main/java/de/ph1b/audiobook/fragment/BookChooseFragment.java
@@ -80,7 +80,7 @@ public void onServiceConnected(ComponentName className,
             } else {
                 currentPlaying.setImageResource(R.drawable.av_play);
             }
-            mService.stateManager.setStateChangeListener(onStateChangedListener);
+            mService.stateManager.addStateChangeListener(onStateChangedListener);
         }
 
         @Override
@@ -109,12 +109,17 @@ public void onStop() {
 
     private final OnStateChangedListener onStateChangedListener = new OnStateChangedListener() {
         @Override
-        public void onStateChanged(PlayerStates state) {
-            if (state == PlayerStates.STARTED) {
-                currentPlaying.setImageResource(R.drawable.av_pause);
-            } else {
-                currentPlaying.setImageResource(R.drawable.av_play);
-            }
+        public void onStateChanged(final PlayerStates state) {
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (state == PlayerStates.STARTED) {
+                        currentPlaying.setImageResource(R.drawable.av_pause);
+                    } else {
+                        currentPlaying.setImageResource(R.drawable.av_play);
+                    }
+                }
+            });
         }
     };
 

diff --git a/audiobook/src/main/java/de/ph1b/audiobook/fragment/BookPlayFragment.java b/audiobook/src/main/java/de/ph1b/audiobook/fragment/BookPlayFragment.java
@@ -90,8 +90,8 @@ public void onServiceConnected(ComponentName className,
             } else {
                 play_button.setImageResource(R.drawable.av_play);
             }
-            mService.stateManager.setStateChangeListener(onStateChangedListener);
-            mService.stateManager.setTimeChangedListener(onTimeChangedListener);
+            mService.stateManager.addStateChangeListener(onStateChangedListener);
+            mService.stateManager.addTimeChangedListener(onTimeChangedListener);
 
             mBound = true;
         }
@@ -121,23 +121,34 @@ public void onStop() {
         }
     }
 
+
     private final OnStateChangedListener onStateChangedListener = new OnStateChangedListener() {
         @Override
-        public void onStateChanged(PlayerStates state) {
-            if (state == PlayerStates.STARTED) {
-                play_button.setImageResource(R.drawable.av_pause);
-            } else {
-                play_button.setImageResource(R.drawable.av_play);
-            }
+        public void onStateChanged(final PlayerStates state) {
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (state == PlayerStates.STARTED) {
+                        play_button.setImageResource(R.drawable.av_pause);
+                    } else {
+                        play_button.setImageResource(R.drawable.av_play);
+                    }
+                }
+            });
         }
     };
 
     private final OnTimeChangedListener onTimeChangedListener = new OnTimeChangedListener() {
         @Override
-        public void onTimeChanged(int time) {
+        public void onTimeChanged(final int time) {
             if (!seekBarIsUpdating) {
-                playedTimeView.setText(formatTime(time));
-                seek_bar.setProgress(time);
+                getActivity().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        playedTimeView.setText(formatTime(time));
+                        seek_bar.setProgress(time);
+                    }
+                });
             }
         }
     };

diff --git a/audiobook/src/main/java/de/ph1b/audiobook/service/AudioPlayerService.java b/audiobook/src/main/java/de/ph1b/audiobook/service/AudioPlayerService.java
@@ -162,27 +162,29 @@ public void onCreate() {
         //state manager to update widget
         widgetComponentName = new ComponentName(this, WidgetProvider.class);
         remoteViews = new RemoteViews(this.getPackageName(), R.layout.widget);
-        stateManager.setStateChangeListener(onStateChangedListener);
+        stateManager.addStateChangeListener(onStateChangedListener);
 
         //registering receiver for pause from notification
         registerReceiver(notificationPauseReceiver, new IntentFilter(NOTIFICATION_PAUSE));
     }
 
     private void handleAction(Intent intent) {
         String action = intent.getAction();
-        if (action.equals(CONTROL_PLAY_PAUSE)) {
-            if (stateManager.getState() == PlayerStates.STARTED)
-                pause();
-            else
-                play();
-        } else if (action.equals(CONTROL_CHANGE_MEDIA_POSITION)) {
-            int position = intent.getIntExtra(CONTROL_CHANGE_MEDIA_POSITION, -1);
-            if (position != -1)
-                changePosition(position);
-        } else if (action.equals(CONTROL_SLEEP)) {
-            int sleepTime = intent.getIntExtra(CONTROL_SLEEP, -1);
-            if (sleepTime > 0)
-                sleepTimer(sleepTime);
+        if (intent.getAction() != null) {
+            if (action.equals(CONTROL_PLAY_PAUSE)) {
+                if (stateManager.getState() == PlayerStates.STARTED)
+                    pause();
+                else
+                    play();
+            } else if (action.equals(CONTROL_CHANGE_MEDIA_POSITION)) {
+                int position = intent.getIntExtra(CONTROL_CHANGE_MEDIA_POSITION, -1);
+                if (position != -1)
+                    changePosition(position);
+            } else if (action.equals(CONTROL_SLEEP)) {
+                int sleepTime = intent.getIntExtra(CONTROL_SLEEP, -1);
+                if (sleepTime > 0)
+                    sleepTimer(sleepTime);
+            }
         }
     }
 
@@ -238,8 +240,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             }
         }
 
-        if (intent.getAction() != null)
-            handleAction(intent);
+        handleAction(intent);
 
         int keyCode = intent.getIntExtra(RemoteControlReceiver.KEYCODE, -1);
         handleKeyCode(keyCode);

diff --git a/audiobook/src/main/java/de/ph1b/audiobook/service/StateManager.java b/audiobook/src/main/java/de/ph1b/audiobook/service/StateManager.java
@@ -15,15 +15,15 @@ public class StateManager {
     private final List<OnTimeChangedListener> allTimeListener = new ArrayList<OnTimeChangedListener>();
 
 
-    public void setStateChangeListener(OnStateChangedListener listener) {
+    public void addStateChangeListener(OnStateChangedListener listener) {
         allStateListener.add(listener);
     }
 
     public void removeStateChangeListener(OnStateChangedListener listener) {
         allStateListener.remove(listener);
     }
 
-    public void setTimeChangedListener(OnTimeChangedListener listener) {
+    public void addTimeChangedListener(OnTimeChangedListener listener) {
         allTimeListener.add(listener);
     }