diff options
Diffstat (limited to 'app/src/main/java/ml')
| -rw-r--r-- | app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java | 2 | ||||
| -rw-r--r-- | app/src/main/java/ml/docilealligator/infinityforreddit/postfilter/PostFilter.java | 5 |
2 files changed, 4 insertions, 3 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; } } |