Merge pull request #2971 from wordpress-mobile/release/2.70.1

Merge Release 2.70.1 into trunk

Author: oguzkocer

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/ThemeRestClient.java

@@ -229,7 +229,8 @@ public void fetchCurrentTheme(@NonNull final SiteModel site) {
 
     @NonNull
     private static ThemeModel createThemeFromWPComResponse(@NonNull WPComThemeResponse response) {
-        boolean free = TextUtils.isEmpty(response.price);
+        boolean free = response.theme_tier == null || response.theme_tier.slug == null
+                       || response.theme_tier.slug.equalsIgnoreCase("free");
         String priceText = null;
         if (!free) {
             priceText = response.price;

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/theme/WPComThemeResponse.java

@@ -23,6 +23,12 @@ public static class WPComThemeTaxonomies {
         @Nullable public WPComThemeMobileFriendlyTaxonomy[] theme_mobile_friendly;
     }
 
+    public static class WPComThemeTier {
+        @Nullable public String slug;
+        @Nullable public String feature;
+        @Nullable public String platform;
+    }
+
     @NonNull public String id;
     @Nullable public String slug;
     @Nullable public String stylesheet;
@@ -38,4 +44,5 @@ public static class WPComThemeTaxonomies {
     @Nullable public String download_uri;
     @Nullable public String price;
     @Nullable public WPComThemeTaxonomies taxonomies;
+    @Nullable public WPComThemeTier theme_tier;
 }