From c1108631ff79fe3cae4cc1b73cb68967ad857e19 Mon Sep 17 00:00:00 2001
From: Tom Hennen <TomHennen@users.noreply.github.com>
Date: Tue, 3 Mar 2015 18:00:29 -0500
Subject: [PATCH] Revert "Add ability to clear the download log"

---
 .../fragment/DownloadLogFragment.java         | 52 ++-----------------
 .../antennapod/core/storage/DBWriter.java     | 20 -------
 .../antennapod/core/storage/PodDBAdapter.java |  4 --
 3 files changed, 3 insertions(+), 73 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
index 0f6f7d53c..c40fce351 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java
@@ -1,35 +1,25 @@
 package de.danoeh.antennapod.fragment;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.app.ListFragment;
-import android.support.v4.view.MenuItemCompat;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
 
-import java.util.List;
-
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.DownloadLogAdapter;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.service.download.DownloadStatus;
 import de.danoeh.antennapod.core.storage.DBReader;
-import de.danoeh.antennapod.core.storage.DBWriter;
-import de.danoeh.antennapod.menuhandler.MenuItemUtils;
-import de.danoeh.antennapod.menuhandler.NavDrawerActivity;
+
+import java.util.List;
 
 /**
  * Shows the download log
  */
 public class DownloadLogFragment extends ListFragment {
 
-    private static final String TAG = "DownloadLogFragment";
-
     private List<DownloadStatus> downloadLog;
     private DownloadLogAdapter adapter;
 
@@ -39,7 +29,6 @@ public class DownloadLogFragment extends ListFragment {
     @Override
     public void onStart() {
         super.onStart();
-        setHasOptionsMenu(true);
         EventDistributor.getInstance().register(contentUpdate);
         startItemLoader();
     }
@@ -74,7 +63,7 @@ public class DownloadLogFragment extends ListFragment {
         }
         setListShown(true);
         adapter.notifyDataSetChanged();
-        getActivity().supportInvalidateOptionsMenu();
+
     }
 
     private DownloadLogAdapter.ItemAccess itemAccess = new DownloadLogAdapter.ItemAccess() {
@@ -116,41 +105,6 @@ public class DownloadLogFragment extends ListFragment {
         }
     }
 
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        if (itemsLoaded && !MenuItemUtils.isActivityDrawerOpen((NavDrawerActivity) getActivity())) {
-            MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label);
-            MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-            TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.content_discard});
-            clearHistory.setIcon(drawables.getDrawable(0));
-            drawables.recycle();
-        }
-    }
-
-    @Override
-    public void onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-        if (itemsLoaded && !MenuItemUtils.isActivityDrawerOpen((NavDrawerActivity) getActivity())) {
-            menu.findItem(R.id.clear_history_item).setVisible(downloadLog != null && !downloadLog.isEmpty());
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (!super.onOptionsItemSelected(item)) {
-            switch (item.getItemId()) {
-                case R.id.clear_history_item:
-                    DBWriter.clearDownloadLog(getActivity());
-                    return true;
-                default:
-                    return false;
-            }
-        } else {
-            return true;
-        }
-    }
-
     private class ItemLoader extends AsyncTask<Void, Void, List<DownloadStatus>> {
 
         @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
index 68ffd0c5b..87bbdf455 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBWriter.java
@@ -238,26 +238,6 @@ public class DBWriter {
         });
     }
 
-    /**
-     * Deletes the entire download log.
-     *
-     * @param context A context that is used for opening a database connection.
-     */
-    public static Future<?> clearDownloadLog(final Context context) {
-        return dbExec.submit(new Runnable() {
-            @Override
-            public void run() {
-                PodDBAdapter adapter = new PodDBAdapter(context);
-                adapter.open();
-                adapter.clearDownloadLog();
-                adapter.close();
-                EventDistributor.getInstance()
-                        .sendDownloadLogUpdateBroadcast();
-            }
-        });
-    }
-
-
     /**
      * Adds a FeedMedia object to the playback history. A FeedMedia object is in the playback history if
      * its playback completion date is set to a non-null value. This method will set the playback completion date to the
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
index f72858adc..ce41147e1 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/PodDBAdapter.java
@@ -889,10 +889,6 @@ public class PodDBAdapter {
         db.update(TABLE_NAME_FEED_MEDIA, values, null, null);
     }
 
-    public void clearDownloadLog() {
-        db.delete(TABLE_NAME_DOWNLOAD_LOG, null, null);
-    }
-
     /**
      * Get all Feeds from the Feed Table.
      *