Move EventBus register/unregister to appropriate class

2 files changed, 8 insertions, 3 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 1cb936296..48b578be7 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -47,7 +47,6 @@ import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.dialog.SleepTimerDialog;
 import de.danoeh.antennapod.dialog.VariableSpeedDialog;
-import de.greenrobot.event.EventBus;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -218,7 +217,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
             controller.pause();
         }
         super.onPause();
-        EventBus.getDefault().unregister(this);
     }
 
     /**
@@ -582,7 +580,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements
         if(controller != null) {
             controller.init();
         }
-        EventBus.getDefault().register(this);
     }
 
     /**
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
index 51afe1ef7..9d2f35e3d 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java
@@ -61,6 +61,7 @@ import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.fragment.SubscriptionFragment;
 import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
 import de.danoeh.antennapod.preferences.PreferenceController;
+import de.greenrobot.event.EventBus;
 import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
@@ -106,6 +107,12 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
     private Subscription subscription;
 
     @Override
+    protected void onPause() {
+        super.onPause();
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Override
     protected void onStop() {
         super.onStop();
         Log.d(TAG, "onStop()");
@@ -175,6 +182,7 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem
         DBTasks.checkShouldRefreshFeeds(getApplicationContext());
 
         EventDistributor.getInstance().register(contentUpdate);
+        EventBus.getDefault().register(this);
         loadData();
     }