1 files changed, 49 insertions, 86 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
index 4bba9b255..705151062 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.fragment;
 
-import android.content.Context;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.ListFragment;
 import android.util.Log;
 import android.view.Menu;
@@ -10,6 +10,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
@@ -21,11 +22,15 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.FeedItemUtil;
 import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment;
+import de.danoeh.antennapod.view.EmptyViewHandler;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
+import static de.danoeh.antennapod.dialog.EpisodesApplyActionFragment.ACTION_ADD_TO_QUEUE;
+import static de.danoeh.antennapod.dialog.EpisodesApplyActionFragment.ACTION_DELETE;
+
 /**
  * Displays all running downloads and provides a button to delete them
  */
@@ -37,24 +42,27 @@ public class CompletedDownloadsFragment extends ListFragment {
             EventDistributor.DOWNLOADLOG_UPDATE |
             EventDistributor.UNREAD_ITEMS_UPDATE;
 
-    private List<FeedItem> items;
+    private List<FeedItem> items = new ArrayList<>();
     private DownloadedEpisodesListAdapter listAdapter;
-
-    private boolean viewCreated = false;
-
     private Disposable disposable;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+    public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
         setHasOptionsMenu(true);
-        loadItems();
+        addVerticalPadding();
+        addEmptyView();
+
+        listAdapter = new DownloadedEpisodesListAdapter(getActivity(), itemAccess);
+        setListAdapter(listAdapter);
+        setListShown(false);
     }
 
     @Override
     public void onStart() {
         super.onStart();
         EventDistributor.getInstance().register(contentUpdate);
+        loadItems();
     }
 
     @Override
@@ -67,99 +75,54 @@ public class CompletedDownloadsFragment extends ListFragment {
     }
 
     @Override
-    public void onDetach() {
-        super.onDetach();
-        if (disposable != null) {
-            disposable.dispose();
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        listAdapter = null;
-        viewCreated = false;
-        if (disposable != null) {
-            disposable.dispose();
-        }
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (viewCreated && items != null) {
-            onFragmentLoaded();
-        }
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        // add padding
-        final ListView lv = getListView();
-        lv.setClipToPadding(false);
-        final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding);
-        lv.setPadding(0, vertPadding, 0, vertPadding);
-
-        viewCreated = true;
-        if (items != null && getActivity() != null) {
-            onFragmentLoaded();
-        }
-    }
-
-    @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
         super.onListItemClick(l, v, position, id);
         position -= l.getHeaderViewsCount();
         long[] ids = FeedItemUtil.getIds(items);
-        ((MainActivity) getActivity()).loadChildFragment(ItemFragment.newInstance(ids, position));
-    }
-
-    private void onFragmentLoaded() {
-        if (listAdapter == null) {
-            listAdapter = new DownloadedEpisodesListAdapter(getActivity(), itemAccess);
-            setListAdapter(listAdapter);
-        }
-        setListShown(true);
-        listAdapter.notifyDataSetChanged();
-        getActivity().supportInvalidateOptionsMenu();
+        ((MainActivity) requireActivity()).loadChildFragment(ItemFragment.newInstance(ids, position));
     }
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if(!isAdded()) {
-            return;
-        }
         super.onCreateOptionsMenu(menu, inflater);
-        if(items != null) {
-            inflater.inflate(R.menu.downloads_completed, menu);
-            menu.findItem(R.id.episode_actions).setVisible(items.size() > 0);
-        }
+        inflater.inflate(R.menu.downloads_completed, menu);
+        menu.findItem(R.id.episode_actions).setVisible(items.size() > 0);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.episode_actions:
-                EpisodesApplyActionFragment fragment = EpisodesApplyActionFragment
-                        .newInstance(items, EpisodesApplyActionFragment.ACTION_REMOVE | EpisodesApplyActionFragment.ACTION_QUEUE);
-                ((MainActivity) getActivity()).loadChildFragment(fragment);
-                return true;
-            default:
-                return false;
+        if (item.getItemId() == R.id.episode_actions) {
+            ((MainActivity) requireActivity())
+                    .loadChildFragment(EpisodesApplyActionFragment.newInstance(items, ACTION_DELETE | ACTION_ADD_TO_QUEUE));
+            return true;
         }
+        return false;
+    }
+
+    private void addEmptyView() {
+        EmptyViewHandler emptyView = new EmptyViewHandler(getActivity());
+        emptyView.setIcon(R.attr.av_download);
+        emptyView.setTitle(R.string.no_comp_downloads_head_label);
+        emptyView.setMessage(R.string.no_comp_downloads_label);
+        emptyView.attachToListView(getListView());
+    }
+
+    private void addVerticalPadding() {
+        final ListView lv = getListView();
+        lv.setClipToPadding(false);
+        final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding);
+        lv.setPadding(0, vertPadding, 0, vertPadding);
     }
 
     private final DownloadedEpisodesListAdapter.ItemAccess itemAccess = new DownloadedEpisodesListAdapter.ItemAccess() {
         @Override
         public int getCount() {
-            return (items != null) ? items.size() : 0;
+            return items.size();
         }
 
         @Override
         public FeedItem getItem(int position) {
-            if (items != null && 0 <= position && position < items.size()) {
+            if (0 <= position && position < items.size()) {
                 return items.get(position);
             } else {
                 return null;
@@ -168,7 +131,7 @@ public class CompletedDownloadsFragment extends ListFragment {
 
         @Override
         public void onFeedItemSecondaryAction(FeedItem item) {
-            DBWriter.deleteFeedMediaOfItem(getActivity(), item.getMedia().getId());
+            DBWriter.deleteFeedMediaOfItem(requireActivity(), item.getMedia().getId());
         }
     };
 
@@ -185,18 +148,18 @@ public class CompletedDownloadsFragment extends ListFragment {
         if (disposable != null) {
             disposable.dispose();
         }
-        if (items == null && viewCreated) {
-            setListShown(false);
-        }
         disposable = Observable.fromCallable(DBReader::getDownloadedItems)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(result -> {
                     items = result;
-                    if (viewCreated && getActivity() != null) {
-                        onFragmentLoaded();
-                    }
-                }, error ->  Log.e(TAG, Log.getStackTraceString(error)));
+                    onItemsLoaded();
+                }, error -> Log.e(TAG, Log.getStackTraceString(error)));
     }
 
+    private void onItemsLoaded() {
+        setListShown(true);
+        listAdapter.notifyDataSetChanged();
+        requireActivity().invalidateOptionsMenu();
+    }
 }