Apply PR suggestion: rename activeFeatures to planActiveFeatures

wordpress-mobile · Jul 6, 2023 · 840ff04 · 840ff04
1 parent 3440764
commit 840ff04
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java b/fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java
@@ -254,7 +254,7 @@ public class SiteModel extends Payload<BaseNetworkError> implements Identifiable
     private Boolean mCanBlaze;
     // Comma-separated list of active features in the site's plan
     @Column
-    private String mActiveFeatures;
+    private String mPlanActiveFeatures;
 
     @Override
     public int getId() {
@@ -1085,15 +1085,15 @@ public boolean isHostedAtWPCom() {
         return !isJetpackInstalled();
     }
 
-    public List<String> getActiveFeaturesList() {
-        return Arrays.asList(mActiveFeatures.split(","));
+    public List<String> getPlanActiveFeaturesList() {
+        return Arrays.asList(mPlanActiveFeatures.split(","));
     }
 
-    public String getActiveFeatures() {
-        return mActiveFeatures;
+    public String getPlanActiveFeatures() {
+        return mPlanActiveFeatures;
     }
 
-    public void setActiveFeatures(final String activeFeatures) {
-        this.mActiveFeatures = activeFeatures;
+    public void setPlanActiveFeatures(final String planActiveFeatures) {
+        this.mPlanActiveFeatures = planActiveFeatures;
     }
 }
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/site/SiteRestClient.kt
@@ -1139,7 +1139,7 @@ class SiteRestClient @Inject constructor(
             site.setIsWPCom(true)
         }
         site.origin = SiteModel.ORIGIN_WPCOM_REST
-        site.activeFeatures = (from.plan?.features?.active?.joinToString(",")).orEmpty()
+        site.planActiveFeatures = (from.plan?.features?.active?.joinToString(",")).orEmpty()
         return site
     }
 

diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt
@@ -1952,7 +1952,7 @@ open class WellSqlConfig : DefaultWellConfig {
                     db.execSQL("ALTER TABLE SiteModel ADD CAN_BLAZE BOOLEAN")
                 }
                 189 -> migrate(version) {
-                    db.execSQL("ALTER TABLE SiteModel ADD ACTIVE_FEATURES TEXT")
+                    db.execSQL("ALTER TABLE SiteModel ADD PLAN_ACTIVE_FEATURES TEXT")
                 }
             }
         }