Merge branch 'develop' into make_multidex_on_debug_build_only

1 files changed, 22 insertions, 14 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
index 66c59b7f7..2a7f7d12b 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java
@@ -7,6 +7,10 @@ import android.view.View;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
@@ -20,7 +24,7 @@ import de.danoeh.antennapod.core.service.download.Downloader;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequester;
-import de.greenrobot.event.EventBus;
+import de.danoeh.antennapod.view.EmptyViewHandler;
 
 /**
  * Displays all running downloads and provides actions to cancel them
@@ -30,7 +34,7 @@ public class RunningDownloadsFragment extends ListFragment {
     private static final String TAG = "RunningDownloadsFrag";
 
     private DownloadlistAdapter adapter;
-    private List<Downloader> downloaderList;
+    private List<Downloader> downloaderList = new ArrayList<>();
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
@@ -44,17 +48,24 @@ public class RunningDownloadsFragment extends ListFragment {
 
         adapter = new DownloadlistAdapter(getActivity(), itemAccess);
         setListAdapter(adapter);
+
+        EmptyViewHandler emptyView = new EmptyViewHandler(getActivity());
+        emptyView.setIcon(R.attr.av_download);
+        emptyView.setTitle(R.string.no_run_downloads_head_label);
+        emptyView.setMessage(R.string.no_run_downloads_label);
+        emptyView.attachToListView(getListView());
+
     }
 
     @Override
-    public void onResume() {
-        super.onResume();
-        EventBus.getDefault().registerSticky(this);
+    public void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
+    public void onStop() {
+        super.onStop();
         EventBus.getDefault().unregister(this);
     }
 
@@ -62,28 +73,25 @@ public class RunningDownloadsFragment extends ListFragment {
     public void onDestroy() {
         super.onDestroy();
         setListAdapter(null);
-        adapter = null;
     }
 
+    @Subscribe(sticky = true)
     public void onEvent(DownloadEvent event) {
         Log.d(TAG, "onEvent() called with: " + "event = [" + event + "]");
         DownloaderUpdate update = event.update;
         downloaderList = update.downloaders;
-        if (adapter != null) {
-            adapter.notifyDataSetChanged();
-        }
+        adapter.notifyDataSetChanged();
     }
 
-
     private final DownloadlistAdapter.ItemAccess itemAccess = new DownloadlistAdapter.ItemAccess() {
         @Override
         public int getCount() {
-            return (downloaderList != null) ? downloaderList.size() : 0;
+            return downloaderList.size();
         }
 
         @Override
         public Downloader getItem(int position) {
-            if (downloaderList != null && 0 <= position && position < downloaderList.size()) {
+            if (0 <= position && position < downloaderList.size()) {
                 return downloaderList.get(position);
             } else {
                 return null;