diff options
Diffstat (limited to 'app/src/main/java')
5 files changed, 32 insertions, 39 deletions
diff --git a/app/src/main/java/org/rssin/android/FeedItemAdapter.java b/app/src/main/java/org/rssin/android/FeedItemAdapter.java index 5ecb820..a16f4b5 100755 --- a/app/src/main/java/org/rssin/android/FeedItemAdapter.java +++ b/app/src/main/java/org/rssin/android/FeedItemAdapter.java @@ -16,7 +16,7 @@ import org.rssin.rssin.R; import java.util.List;
-public class FeedItemAdapter extends RecyclerView.Adapter<FeedItemAdapter.FeedItemHolder> {
+class FeedItemAdapter extends RecyclerView.Adapter<FeedItemAdapter.FeedItemHolder> {
List<FeedItem> feedItems;
public FeedItemAdapter(List<FeedItem> objects) {
diff --git a/app/src/main/java/org/rssin/android/FiltersActivity.java b/app/src/main/java/org/rssin/android/FiltersActivity.java index 74675b9..35bd533 100755 --- a/app/src/main/java/org/rssin/android/FiltersActivity.java +++ b/app/src/main/java/org/rssin/android/FiltersActivity.java @@ -8,7 +8,6 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.support.v7.app.ActionBarActivity; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -182,8 +181,6 @@ public class FiltersActivity extends ActionBarActivity { this.context = context; layoutResourceId = resource; items = objects; - - Log.d("FilterA", "Number of filters: " + objects.size()); } @Override diff --git a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java index 54dab68..25d04be 100755 --- a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java +++ b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java @@ -40,36 +40,30 @@ public class UnifiedInboxActivity extends ActionBarActivity { try { filtersList = FiltersList.getInstance(this); - } catch (IOException e) { - Frontend.error(this, R.string.error_load_filters, e); - } - - Intent intent = getIntent(); - int filterHashCode = intent.getIntExtra("filter", -1); - - // @todo Check on -1? Shouldn't happen anyway. - for(Filter filter : filtersList.getFilters()) { - filter.ensureFeedSorter(DefaultStorageProvider.getInstance(this)); - filter.ensureFeeds(DefaultStorageProvider.getInstance(this)); - } - setTitle("Inbox"); - - UnifiedFilterLoader loaderAndSorter = new UnifiedFilterLoader(filtersList.getFilters()); - loaderAndSorter.getFilteredFeedItems(new VolleyFetcher(this), new FallibleListener<List<FeedItem>, VolleyError>() { - @Override - public void onReceive(List<FeedItem> data) { - - FeedItemAdapter feedItemAdapter = new FeedItemAdapter(data); - mRecyclerView.setAdapter(feedItemAdapter); - mRecyclerView.setHasFixedSize(true); + for(Filter filter : filtersList.getFilters()) { + filter.ensureFeedSorter(DefaultStorageProvider.getInstance(this)); + filter.ensureFeeds(DefaultStorageProvider.getInstance(this)); } - @Override - public void onError(VolleyError error) { - Frontend.error(getBaseContext(), R.string.error_net_load); - } - }); + UnifiedFilterLoader loaderAndSorter = new UnifiedFilterLoader(filtersList.getFilters()); + loaderAndSorter.getFilteredFeedItems(new VolleyFetcher(this), new FallibleListener<List<FeedItem>, VolleyError>() { + @Override + public void onReceive(List<FeedItem> data) { + Frontend.info(getBaseContext(), "Number of feed items: " + data.size()); + FeedItemAdapter feedItemAdapter = new FeedItemAdapter(data); + mRecyclerView.setAdapter(feedItemAdapter); + mRecyclerView.setHasFixedSize(true); + } + + @Override + public void onError(VolleyError error) { + Frontend.error(getBaseContext(), R.string.error_net_load); + } + }); + } catch (IOException e) { + Frontend.error(this, R.string.error_load_filters, e); + } } @Override diff --git a/app/src/main/java/org/rssin/rssin/Feed.java b/app/src/main/java/org/rssin/rssin/Feed.java index ea7e310..9df5e2f 100755 --- a/app/src/main/java/org/rssin/rssin/Feed.java +++ b/app/src/main/java/org/rssin/rssin/Feed.java @@ -104,7 +104,11 @@ public class Feed implements Storable, Comparable<Feed> { @Override public int hashCode() { - return title.hashCode() ^ url.toString().hashCode(); + try { + return Integer.parseInt(storageKey.toString()); + } catch (NumberFormatException e) { + return storageKey.hashCode(); + } } @Override diff --git a/app/src/main/java/org/rssin/rssin/Filter.java b/app/src/main/java/org/rssin/rssin/Filter.java index 6d2c11f..2c8e40e 100755 --- a/app/src/main/java/org/rssin/rssin/Filter.java +++ b/app/src/main/java/org/rssin/rssin/Filter.java @@ -151,13 +151,11 @@ public class Filter implements Storable, Comparable<Filter> { @Override public int hashCode() { - StringBuilder sb = new StringBuilder(title); - for (Feed f : feeds) - sb.append(f.toString()); - for (Keyword k : keywords) - sb.append(k.toString()); - - return sb.toString().hashCode(); + try { + return Integer.parseInt(storageKey.toString()); + } catch (NumberFormatException e) { + return storageKey.hashCode(); + } } /** |