Merge DefaultOnlineFeedViewActivity into OnlineFeedViewActivity

5 files changed, 6 insertions, 264 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 710446885..72e7752b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -203,7 +203,7 @@
             android:value="de.danoeh.antennapod.activity.PreferenceActivity"/>
 
         <activity
-            android:name=".activity.DefaultOnlineFeedViewActivity"
+            android:name=".activity.OnlineFeedViewActivity"
             android:configChanges="orientation"
             android:label="@string/add_feed_label">
             <meta-data
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
deleted file mode 100644
index 0993ed6d6..000000000
--- a/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package de.danoeh.antennapod.activity;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.support.v4.app.NavUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.Spinner;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
-import org.apache.commons.lang3.StringUtils;
-import org.jsoup.Jsoup;
-import org.jsoup.examples.HtmlToPlainText;
-import org.jsoup.nodes.Document;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import de.danoeh.antennapod.BuildConfig;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.adapter.FeedItemlistDescriptionAdapter;
-import de.danoeh.antennapod.core.dialog.DownloadRequestErrorDialogCreator;
-import de.danoeh.antennapod.core.feed.EventDistributor;
-import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedItem;
-import de.danoeh.antennapod.core.glide.ApGlideSettings;
-import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DownloadRequestException;
-import de.danoeh.antennapod.core.storage.DownloadRequester;
-
-/**
- * Default implementation of OnlineFeedViewActivity. Shows the downloaded feed's items with their descriptions,
- * a subscribe button and a spinner for choosing alternate feed URLs.
- */
-public class DefaultOnlineFeedViewActivity extends OnlineFeedViewActivity {
-    private static final String TAG = "DefaultOnlineFeedViewActivity";
-
-    private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED | EventDistributor.DOWNLOAD_QUEUED | EventDistributor.FEED_LIST_UPDATE;
-    private volatile List<Feed> feeds;
-    private Feed feed;
-    private String selectedDownloadUrl;
-
-    private Button subscribeButton;
-
-    @Override
-    protected void onCreate(Bundle arg0) {
-        super.onCreate(arg0);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                Intent destIntent = new Intent(this, MainActivity.class);
-                if (NavUtils.shouldUpRecreateTask(this, destIntent)) {
-                    startActivity(destIntent);
-                } else {
-                    NavUtils.navigateUpFromSameTask(this);
-                }
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    protected void loadData() {
-        super.loadData();
-        feeds = DBReader.getFeedList(this);
-    }
-
-    @Override
-    protected void beforeShowFeedInformation(Feed feed, Map<String, String> alternateFeedUrls) {
-        super.beforeShowFeedInformation(feed, alternateFeedUrls);
-
-        // remove HTML tags from descriptions
-
-        if (BuildConfig.DEBUG) Log.d(TAG, "Removing HTML from shownotes");
-        if (feed.getItems() != null) {
-            HtmlToPlainText formatter = new HtmlToPlainText();
-            for (FeedItem item : feed.getItems()) {
-                if (item.getDescription() != null) {
-                    Document description = Jsoup.parse(item.getDescription());
-                    item.setDescription(StringUtils.trim(formatter.getPlainText(description)));
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void showFeedInformation(final Feed feed, final Map<String, String> alternateFeedUrls) {
-        super.showFeedInformation(feed, alternateFeedUrls);
-        setContentView(R.layout.listview_activity);
-
-        this.feed = feed;
-        this.selectedDownloadUrl = feed.getDownload_url();
-        EventDistributor.getInstance().register(listener);
-        ListView listView = (ListView) findViewById(R.id.listview);
-        LayoutInflater inflater = (LayoutInflater)
-                getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View header = inflater.inflate(R.layout.onlinefeedview_header, listView, false);
-        listView.addHeaderView(header);
-
-        listView.setAdapter(new FeedItemlistDescriptionAdapter(this, 0, feed.getItems()));
-
-        ImageView cover = (ImageView) header.findViewById(R.id.imgvCover);
-        TextView title = (TextView) header.findViewById(R.id.txtvTitle);
-        TextView author = (TextView) header.findViewById(R.id.txtvAuthor);
-        TextView description = (TextView) header.findViewById(R.id.txtvDescription);
-        Spinner spAlternateUrls = (Spinner) header.findViewById(R.id.spinnerAlternateUrls);
-
-        subscribeButton = (Button) header.findViewById(R.id.butSubscribe);
-
-        if (feed.getImage() != null && StringUtils.isNotBlank(feed.getImage().getDownload_url())) {
-            Glide.with(this)
-                    .load(feed.getImage().getDownload_url())
-                    .placeholder(R.color.light_gray)
-                    .error(R.color.light_gray)
-                    .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                    .fitCenter()
-                    .dontAnimate()
-                    .into(cover);
-        }
-
-        title.setText(feed.getTitle());
-        author.setText(feed.getAuthor());
-        description.setText(feed.getDescription());
-
-        subscribeButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    Feed f = new Feed(selectedDownloadUrl, new Date(0), feed.getTitle());
-                    f.setPreferences(feed.getPreferences());
-                    DefaultOnlineFeedViewActivity.this.feed = f;
-
-                    DownloadRequester.getInstance().downloadFeed(
-                            DefaultOnlineFeedViewActivity.this,
-                            f);
-                } catch (DownloadRequestException e) {
-                    e.printStackTrace();
-                    DownloadRequestErrorDialogCreator.newRequestErrorDialog(DefaultOnlineFeedViewActivity.this,
-                            e.getMessage());
-                }
-                setSubscribeButtonState(feed);
-            }
-        });
-
-        if (alternateFeedUrls.isEmpty()) {
-            spAlternateUrls.setVisibility(View.GONE);
-        } else {
-            spAlternateUrls.setVisibility(View.VISIBLE);
-
-            final List<String> alternateUrlsList = new ArrayList<String>();
-            final List<String> alternateUrlsTitleList = new ArrayList<String>();
-
-            alternateUrlsList.add(feed.getDownload_url());
-            alternateUrlsTitleList.add(feed.getTitle());
-
-
-            alternateUrlsList.addAll(alternateFeedUrls.keySet());
-            for (String url : alternateFeedUrls.keySet()) {
-                alternateUrlsTitleList.add(alternateFeedUrls.get(url));
-            }
-            ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, alternateUrlsTitleList);
-            adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            spAlternateUrls.setAdapter(adapter);
-            spAlternateUrls.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-                @Override
-                public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-                    selectedDownloadUrl = alternateUrlsList.get(position);
-                }
-
-                @Override
-                public void onNothingSelected(AdapterView<?> parent) {
-
-                }
-            });
-
-
-        }
-        setSubscribeButtonState(feed);
-
-    }
-
-    private boolean feedInFeedlist(Feed feed) {
-        if (feeds == null || feed == null)
-            return false;
-        for (Feed f : feeds) {
-            if (f.getIdentifyingValue().equals(feed.getIdentifyingValue())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void setSubscribeButtonState(Feed feed) {
-        if (subscribeButton != null && feed != null) {
-            if (DownloadRequester.getInstance().isDownloadingFile(feed.getDownload_url())) {
-                subscribeButton.setEnabled(false);
-                subscribeButton.setText(R.string.downloading_label);
-            } else if (feedInFeedlist(feed)) {
-                subscribeButton.setEnabled(false);
-                subscribeButton.setText(R.string.subscribed_label);
-            } else {
-                subscribeButton.setEnabled(true);
-                subscribeButton.setText(R.string.subscribe_label);
-            }
-        }
-    }
-
-    EventDistributor.EventListener listener = new EventDistributor.EventListener() {
-        @Override
-        public void update(EventDistributor eventDistributor, Integer arg) {
-            if ((arg & EventDistributor.FEED_LIST_UPDATE) != 0) {
-                new AsyncTask<Void, Void, List<Feed>>() {
-                    @Override
-                    protected List<Feed> doInBackground(Void... params) {
-                        return DBReader.getFeedList(DefaultOnlineFeedViewActivity.this);
-                    }
-
-                    @Override
-                    protected void onPostExecute(List<Feed> feeds) {
-                        super.onPostExecute(feeds);
-                        DefaultOnlineFeedViewActivity.this.feeds = feeds;
-                        setSubscribeButtonState(feed);
-                    }
-                }.execute();
-            } else if ((arg & EVENTS) != 0) {
-                setSubscribeButtonState(feed);
-            }
-        }
-    };
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        EventDistributor.getInstance().unregister(listener);
-    }
-}
-
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
index bbe6fab46..f6c80aa7c 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AddFeedFragment.java
@@ -10,7 +10,6 @@ import android.widget.Button;
 import android.widget.EditText;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.OpmlImportFromPathActivity;
@@ -73,7 +72,7 @@ public class AddFeedFragment extends Fragment {
         butConfirm.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent intent = new Intent(getActivity(), DefaultOnlineFeedViewActivity.class);
+                Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class);
                 intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, etxtFeedurl.getText().toString());
                 intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, getString(R.string.add_feed_label));
                 startActivity(intent);
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
index edd4da7fe..72704245f 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItunesSearchFragment.java
@@ -28,7 +28,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
 import de.danoeh.antennapod.adapter.itunes.ItunesAdapter;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
@@ -96,13 +95,13 @@ public class ItunesSearchFragment extends Fragment {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 Intent intent = new Intent(getActivity(),
-                        DefaultOnlineFeedViewActivity.class);
+                        OnlineFeedViewActivity.class);
 
                 //Tell the OnlineFeedViewActivity where to go
                 String url = searchResults.get(position).feedUrl;
                 intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, url);
 
-                intent.putExtra(DefaultOnlineFeedViewActivity.ARG_TITLE, "iTunes");
+                intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, "iTunes");
                 startActivity(intent);
             }
         });
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
index 623c6faa7..204f36956 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/PodcastListFragment.java
@@ -23,7 +23,6 @@ import android.widget.TextView;
 import java.util.List;
 
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity;
 import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.activity.OnlineFeedViewActivity;
 import de.danoeh.antennapod.adapter.gpodnet.PodcastListAdapter;
@@ -104,9 +103,9 @@ public abstract class PodcastListFragment extends Fragment {
 
     protected void onPodcastSelected(GpodnetPodcast selection) {
         Log.d(TAG, "Selected podcast: " + selection.toString());
-        Intent intent = new Intent(getActivity(), DefaultOnlineFeedViewActivity.class);
+        Intent intent = new Intent(getActivity(), OnlineFeedViewActivity.class);
         intent.putExtra(OnlineFeedViewActivity.ARG_FEEDURL, selection.getUrl());
-        intent.putExtra(DefaultOnlineFeedViewActivity.ARG_TITLE, getString(R.string.gpodnet_main_label));
+        intent.putExtra(OnlineFeedViewActivity.ARG_TITLE, getString(R.string.gpodnet_main_label));
         startActivity(intent);
     }