diff options
Diffstat (limited to '')
5 files changed, 21 insertions, 19 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java index 68efd8c0..f5164ebd 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java @@ -99,7 +99,7 @@ class ParseSubscribedThing { String description = data.getString(JSONUtils.PUBLIC_DESCRIPTION_KEY).trim(); String sidebarDescription = data.getString(JSONUtils.DESCRIPTION_KEY); int nSubscribers = data.getInt(JSONUtils.SUBSCRIBERS_KEY); - long createdUTC = data.getLong(JSONUtils.CREATED_UTC_KEY); + long createdUTC = data.getLong(JSONUtils.CREATED_UTC_KEY) * 1000; String suggestedCommentSort = data.getString(JSONUtils.SUGGESTED_COMMENT_SORT_KEY); boolean isNSFW = data.getBoolean(JSONUtils.OVER18_KEY); newSubscribedSubredditData.add(new SubscribedSubredditData(id, name, iconUrl, accountName, isFavorite)); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java index f61ecc46..87185b19 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java @@ -202,10 +202,11 @@ public class PostFilter implements Parcelable { } } } - if (postFilter.excludeDomains != null && !postFilter.excludeDomains.equals("")) { + if (post.getUrl() != null && postFilter.excludeDomains != null && !postFilter.excludeDomains.equals("")) { String[] domains = postFilter.excludeDomains.split(",", 0); + String url = post.getUrl().toLowerCase(); for (String f : domains) { - if (!f.trim().equals("") && post.getUrl().toLowerCase().contains(f.trim().toLowerCase())) { + if (!f.trim().equals("") && url.contains(f.trim().toLowerCase())) { return false; } } diff --git a/app/src/main/res/menu/search_result_activity.xml b/app/src/main/res/menu/search_result_activity.xml index d503471f..97badadb 100644 --- a/app/src/main/res/menu/search_result_activity.xml +++ b/app/src/main/res/menu/search_result_activity.xml @@ -2,17 +2,17 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item - android:id="@+id/action_sort_search_result_activity" + android:id="@+id/action_search_search_result_activity" android:orderInCategory="1" - android:title="@string/action_sort" - android:icon="@drawable/ic_sort_toolbar_24dp" + android:title="@string/action_search" + android:icon="@drawable/ic_search_toolbar_24dp" app:showAsAction="ifRoom" /> <item - android:id="@+id/action_search_search_result_activity" + android:id="@+id/action_sort_search_result_activity" android:orderInCategory="2" - android:title="@string/action_search" - android:icon="@drawable/ic_search_toolbar_24dp" + android:title="@string/action_sort" + android:icon="@drawable/ic_sort_toolbar_24dp" app:showAsAction="ifRoom" /> <item diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml index 1144d8e7..3521819a 100644 --- a/app/src/main/res/menu/view_subreddit_detail_activity.xml +++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml @@ -4,18 +4,19 @@ xmlns:tools="http://schemas.android.com/tools" tools:application="ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity"> <item - android:id="@+id/action_sort_view_subreddit_detail_activity" + android:id="@+id/action_search_view_subreddit_detail_activity" android:orderInCategory="1" - android:title="@string/action_sort" - android:icon="@drawable/ic_sort_toolbar_24dp" + android:title="@string/action_search" + android:icon="@drawable/ic_search_toolbar_24dp" app:showAsAction="ifRoom" /> <item - android:id="@+id/action_search_view_subreddit_detail_activity" + android:id="@+id/action_sort_view_subreddit_detail_activity" android:orderInCategory="2" - android:title="@string/action_search" - android:icon="@drawable/ic_search_toolbar_24dp" + android:title="@string/action_sort" + android:icon="@drawable/ic_sort_toolbar_24dp" app:showAsAction="ifRoom" /> + <item android:id="@+id/action_refresh_view_subreddit_detail_activity" android:orderInCategory="3" diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml index b62d5c81..05e4c3cb 100644 --- a/app/src/main/res/menu/view_user_detail_activity.xml +++ b/app/src/main/res/menu/view_user_detail_activity.xml @@ -3,16 +3,16 @@ xmlns:tools="http://schemas.android.com/tools" tools:application="ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity"> <item - android:id="@+id/action_sort_view_user_detail_activity" + android:id="@+id/action_search_view_user_detail_activity" android:orderInCategory="1" android:title="@string/action_search" - android:icon="@drawable/ic_sort_toolbar_24dp" + android:icon="@drawable/ic_search_toolbar_24dp" app:showAsAction="ifRoom" /> <item - android:id="@+id/action_search_view_user_detail_activity" + android:id="@+id/action_sort_view_user_detail_activity" android:orderInCategory="2" android:title="@string/action_search" - android:icon="@drawable/ic_search_toolbar_24dp" + android:icon="@drawable/ic_sort_toolbar_24dp" app:showAsAction="ifRoom" /> <item android:id="@+id/action_refresh_view_user_detail_activity" |