From ab75363f0ea617aac92e1ad8cc1a42fc37716ff6 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 10 Jun 2015 20:36:52 +0200
Subject: Cleanup

---
 .../NavigationDrawerManageFeedsFragment.java       | 42 ++++++++++------------
 .../java/org/rssin/rss/FeedSorterProvider.java     |  1 -
 .../java/org/rssin/rssin/FeedLoaderAndSorter.java  |  4 ---
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
index ef5e1c7..5d1b791 100644
--- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
+++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java
@@ -1,21 +1,21 @@
-/**
- * RSSin - Clever RSS reader for Android
- * Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by 
- * the Free Software Foundation; either version 2 of the License, or 
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+/**
+ * RSSin - Clever RSS reader for Android
+ * Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation; either version 2 of the License, or 
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 package org.rssin.android;
 
 import android.app.Activity;
@@ -47,13 +47,7 @@ import java.util.List;
  * @author Jos.
  */
 public class NavigationDrawerManageFeedsFragment extends Fragment {
-    /**
-     * The fragment argument representing the section number for this
-     * fragment.
-     */
-    private static final String ARG_FILTER_NAME = "filter_id";
 
-    private Filter filter;
     private View rootView;
 
     /**
diff --git a/app/src/main/java/org/rssin/rss/FeedSorterProvider.java b/app/src/main/java/org/rssin/rss/FeedSorterProvider.java
index 304e4fc..cd3f3f3 100644
--- a/app/src/main/java/org/rssin/rss/FeedSorterProvider.java
+++ b/app/src/main/java/org/rssin/rss/FeedSorterProvider.java
@@ -62,7 +62,6 @@ public class FeedSorterProvider {
                 sorter = (FeedSorter) storageProvider.fetch(storageKey, FeedSorter.class);
             } catch (Exception e) {
                 sorter = new FeedSorter();
-                Log.v("FST", "Saving new empty sorterProvider", e);
                 this.save();
             }
         }
diff --git a/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java b/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
index bd73538..6244d2e 100644
--- a/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
+++ b/app/src/main/java/org/rssin/rssin/FeedLoaderAndSorter.java
@@ -59,7 +59,6 @@ public class FeedLoaderAndSorter {
             final RealtimeListener<List<SortedFeedItemContainer>, Object> listener) {
         final List<SortedFeedItemContainer> resultingItems = new ArrayList<>();
         final Counter counter = new Counter(feeds.size());
-        Log.v("FLAS", "Counter has size " + feeds.size());
         final FeedSorter sorter = FeedSorterProvider.getInstance(storageProvider).getFeedSorter();
 
         for (Feed feed : feeds) {
@@ -116,11 +115,8 @@ public class FeedLoaderAndSorter {
 
                     synchronized (counter) {
                         counter.decr();
-                        Log.v("FLAS", "Counter has size " + counter.count);
-                        Log.v("FLAS", "Calling onReceive");
                         listener.onReceive(resultingItems);
                         if (counter.isZero()) {
-                            Log.v("FLAS", "Calling finish");
                             ((RealtimeListener) listener).finish();
                         }
                     }
-- 
cgit v1.2.3