EventBus license, fixed NPE with undobar onHide(), no smarking on closing of audio player activity

1 files changed, 10 insertions, 5 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
index b24bf195a..d30cf76df 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/NewEpisodesFragment.java
@@ -124,6 +124,9 @@ public class NewEpisodesFragment extends Fragment {
         EventDistributor.getInstance().unregister(contentUpdate);
         EventBus.getDefault().unregister(this);
         stopItemLoader();
+        if(undoBarController.isShowing()) {
+            undoBarController.close();
+        }
     }
 
     @Override
@@ -267,22 +270,24 @@ public class NewEpisodesFragment extends Fragment {
         });
 
         undoBarController = new UndoBarController<FeedItemUndoToken>(root.findViewById(R.id.undobar), new UndoBarController.UndoListener<FeedItemUndoToken>() {
+
+            private final Context context = getActivity();
+
             @Override
             public void onUndo(FeedItemUndoToken token) {
                 if (token != null) {
                     long itemId = token.getFeedItemId();
-                    int position = token.getPosition();
-                    DBWriter.markItemRead(getActivity(), itemId, false);
+                    DBWriter.markItemRead(context, itemId, false);
                 }
             }
             @Override
             public void onHide(FeedItemUndoToken token) {
-                if (token != null) {
+                if (token != null && context != null) {
                     long itemId = token.getFeedItemId();
-                    FeedItem item = DBReader.getFeedItem(getActivity(), itemId);
+                    FeedItem item = DBReader.getFeedItem(context, itemId);
                     FeedMedia media = item.getMedia();
                     if(media != null && media.hasAlmostEnded() && UserPreferences.isAutoDelete()) {
-                        DBWriter.deleteFeedMediaOfItem(getActivity(), media.getId());
+                        DBWriter.deleteFeedMediaOfItem(context, media.getId());
                     }
                 }
             }