From b69699692e32846edb9bf69bbc3e42f3482e3c9f Mon Sep 17 00:00:00 2001 From: khaykov Date: Thu, 7 Jan 2021 14:58:07 -0800 Subject: [PATCH 1/2] Moving 1000 suffix to uppercase. --- WordPress/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index a454a6a0c30b..1d6c4ed4f440 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -937,7 +937,7 @@ -%s - %sk + %sK %sM %sB %sT From 20185963f86ded2566a8ad17e4704b4bdb749114 Mon Sep 17 00:00:00 2001 From: khaykov Date: Thu, 7 Jan 2021 14:59:43 -0800 Subject: [PATCH 2/2] Remove unnecessary has() check. --- .../main/java/org/wordpress/android/models/ReaderBlog.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java b/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java index a72b9b25590c..8e3930af7eec 100644 --- a/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java +++ b/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java @@ -82,9 +82,7 @@ public static ReaderBlog fromJson(JSONObject json) { blog.numSubscribers = json.optInt("subscribers_count"); } - if (json.has("unseen_count")) { - blog.numUnseenPosts = json.optInt("unseen_count"); - } + blog.numUnseenPosts = json.optInt("unseen_count"); // blogId will be empty for feeds, so set it to the feedId (consistent with /read/ endpoints) if (blog.blogId == 0 && blog.feedId != 0) {