Merge pull request #1646 from Automattic/update/add-was-sustainer-preference

Add check for was_sustainer property to verify sustainer status

Author: khaykov

Simplenote/src/main/java/com/automattic/simplenote/PreferencesFragment.java

@@ -243,10 +243,8 @@ public boolean onPreferenceClick(Preference preference) {
 
         final SwitchPreferenceCompat sustainerIconPreference = findPreference("pref_key_sustainer_icon");
         try {
-            if (
-                mPreferencesBucket.get(PREFERENCES_OBJECT_KEY).getCurrentSubscriptionPlatform() != null &&
-                Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
-            ) {
+            boolean wasSustainer = mPreferencesBucket.get(PREFERENCES_OBJECT_KEY).getWasSustainer();
+            if (wasSustainer && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 sustainerIconPreference.setVisible(true);
                 sustainerIconPreference.setOnPreferenceChangeListener((preference, newValue) -> {
                     toggleSustainerAppIcon((boolean) newValue);

Simplenote/src/main/java/com/automattic/simplenote/models/Preferences.java

@@ -19,6 +19,7 @@ public class Preferences extends BucketObject {
     private static final String SUBSCRIPTION_LEVEL_KEY = "subscription_level";
     private static final String SUBSCRIPTION_PLATFORM_KEY = "subscription_platform";
     private static final String SUBSCRIPTION_DATE_KEY = "subscription_date";
+    private static final String WAS_SUSTAINER_KEY = "was_sustainer";
 
     private Preferences(String key, JSONObject properties) {
         super(key, properties);
@@ -115,6 +116,15 @@ public void setSubscriptionLevel(SubscriptionLevel subscriptionLevel) {
         setProperty(SUBSCRIPTION_LEVEL_KEY, subscriptionLevel.getName());
     }
 
+    public boolean getWasSustainer() {
+        Object wasSustainer = getProperty(WAS_SUSTAINER_KEY);
+        if (wasSustainer == null) {
+            return false;
+        }
+
+        return (Boolean)getProperty(WAS_SUSTAINER_KEY);
+    }
+
     public static class Schema extends BucketSchema<Preferences> {
 
         public Schema() {