Merge pull request #1403 from wordpress-mobile/issue/1402-cache-jetpack-user-email

Woo: Issue/1402 cache jetpack user email to SiteModel

Author: 0nko

fluxc/src/main/java/org/wordpress/android/fluxc/model/SiteModel.java

@@ -70,6 +70,7 @@ public class SiteModel extends Payload<BaseNetworkError> implements Identifiable
     // mIsJetpackConnected is true if Jetpack is installed, activated and connected to a WordPress.com account.
     @Column private boolean mIsJetpackConnected;
     @Column private String mJetpackVersion;
+    @Column private String mJetpackUserEmail;
     @Column private boolean mIsAutomatedTransfer;
     @Column private boolean mIsWpComStore;
     @Column private boolean mHasWooCommerce;
@@ -555,6 +556,14 @@ public void setJetpackVersion(String jetpackVersion) {
         mJetpackVersion = jetpackVersion;
     }
 
+    public String getJetpackUserEmail() {
+        return mJetpackUserEmail;
+    }
+
+    public void setJetpackUserEmail(String jetpackUserEmail) {
+        mJetpackUserEmail = jetpackUserEmail;
+    }
+
     public boolean isAutomatedTransfer() {
         return mIsAutomatedTransfer;
     }

fluxc/src/main/java/org/wordpress/android/fluxc/network/xmlrpc/site/SiteXMLRPCClient.java

@@ -104,7 +104,7 @@ public void fetchSite(final SiteModel site) {
         params.add(site.getPassword());
         params.add(new String[] {
                 "software_version", "post_thumbnail", "default_comment_status", "jetpack_client_id",
-                "blog_public", "home_url", "admin_url", "login_url", "blog_title", "time_zone" });
+                "blog_public", "home_url", "admin_url", "login_url", "blog_title", "time_zone", "jetpack_user_email" });
         final XMLRPCRequest request = new XMLRPCRequest(
                 site.getXmlRpcUrl(), XMLRPC.GET_OPTIONS, params,
                 new Listener<Object>() {
@@ -261,6 +261,13 @@ private void setJetpackStatus(Map<?, ?> siteOptions, SiteModel oldModel) {
         } else {
             oldModel.setSiteId(0);
         }
+
+        // * Jetpack not installed: field "jetpack_user_email" not included in the response
+        // * Jetpack installed but not activated: field "jetpack_user_email" not included in the response
+        // * Jetpack installed, activated but not connected: field "jetpack_user_email" not included in the response
+        // * Jetpack installed, activated and connected: field "jetpack_user_email" included and is correctly
+        //   set to the email of the jetpack connected user
+        oldModel.setJetpackUserEmail(XMLRPCUtils.safeGetNestedMapValue(siteOptions, "jetpack_user_email", ""));
     }
 
     private SiteModel updateSiteFromOptions(Object response, SiteModel oldModel) {

fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt

@@ -27,7 +27,7 @@ open class WellSqlConfig : DefaultWellConfig {
     annotation class AddOn
 
     override fun getDbVersion(): Int {
-        return 89
+        return 90
     }
 
     override fun getDbName(): String {
@@ -1003,6 +1003,9 @@ open class WellSqlConfig : DefaultWellConfig {
                 88 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
                     db.execSQL("ALTER TABLE WCOrderNoteModel ADD AUTHOR TEXT")
                 }
+                89 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD JETPACK_USER_EMAIL TEXT")
+                }
             }
         }
         db.setTransactionSuccessful()