Feature/sharing update to fluxc

WordPress/src/main/java/org/wordpress/android/datasets/PublicizeTable.java

@@ -209,9 +209,9 @@ public static void addOrUpdateConnection(PublicizeConnection connection) {
         getReadableDb().insertWithOnConflict(CONNECTIONS_TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
-    public static PublicizeConnectionList getConnectionsForSite(int siteId) {
+    public static PublicizeConnectionList getConnectionsForSite(long siteId) {
         PublicizeConnectionList connectionList= new PublicizeConnectionList();
-        String args[] = {Integer.toString(siteId)};
+        String args[] = {Long.toString(siteId)};
         Cursor c = getReadableDb().rawQuery("SELECT * FROM " + CONNECTIONS_TABLE + " WHERE site_id=?", args);
         try {
             while (c.moveToNext()) {
@@ -223,12 +223,12 @@ public static PublicizeConnectionList getConnectionsForSite(int siteId) {
         }
     }
 
-    public static void setConnectionsForSite(int siteId, PublicizeConnectionList connectionList) {
+    public static void setConnectionsForSite(long siteId, PublicizeConnectionList connectionList) {
         SQLiteStatement stmt = null;
         SQLiteDatabase db = getWritableDb();
         db.beginTransaction();
         try {
-            db.delete(CONNECTIONS_TABLE, "site_id=?", new String[] {Integer.toString(siteId)});
+            db.delete(CONNECTIONS_TABLE, "site_id=?", new String[] {Long.toString(siteId)});
 
             stmt = db.compileStatement(
                     "INSERT INTO " + CONNECTIONS_TABLE
@@ -278,7 +278,7 @@ public static void setConnectionsForSite(int siteId, PublicizeConnectionList con
     private static PublicizeConnection getConnectionFromCursor(Cursor c) {
         PublicizeConnection connection = new PublicizeConnection();
 
-        connection.siteId = c.getInt(c.getColumnIndex("site_id"));
+        connection.siteId = c.getLong(c.getColumnIndex("site_id"));
         connection.connectionId = c.getInt(c.getColumnIndex("id"));
         connection.userId = c.getInt(c.getColumnIndex("user_id"));
         connection.keyringConnectionId = c.getInt(c.getColumnIndex("keyring_connection_id"));

WordPress/src/main/java/org/wordpress/android/models/PublicizeConnection.java

@@ -25,7 +25,7 @@ public String toString() {
     }
 
     public int connectionId;
-    public int siteId;
+    public long siteId;
     public int keyringConnectionId;
     public int keyringConnectionUserId;
 
@@ -41,7 +41,7 @@ public String toString() {
     private String mExternalName;
     private String mExternalDisplayName;
     private String mExternalProfilePictureUrl;
-    private int[] mSites;
+    private long[] mSites;
 
     // `status` can be `ok` or `broken` -- `broken` means the connection needs to be re-established via the `refresh_URL`
     private String mStatus;
@@ -139,15 +139,15 @@ public boolean isSameAs(PublicizeConnection other) {
                 && other.getService().equals(this.getService());
     }
 
-    public void setSites(int[] sites) {
+    public void setSites(long[] sites) {
         mSites = sites;
     }
 
-    public int[] getSites() {
+    public long[] getSites() {
         return mSites;
     }
 
-    public boolean isInSite(int siteId) {
+    public boolean isInSite(long siteId) {
         for (int i = 0; i < mSites.length; i++) {
             if (siteId == mSites[i]) {
                 return true;
@@ -190,7 +190,7 @@ public static PublicizeConnection fromJson(JSONObject json) {
         PublicizeConnection connection = new PublicizeConnection();
 
         connection.connectionId = json.optInt("ID");
-        connection.siteId = json.optInt("site_ID");
+        connection.siteId = json.optLong("site_ID");
         connection.userId = json.optInt("user_ID");
         connection.keyringConnectionId = json.optInt("keyring_connection_ID");
         connection.keyringConnectionUserId = json.optInt("keyring_connection_user_ID");
@@ -210,17 +210,17 @@ public static PublicizeConnection fromJson(JSONObject json) {
             JSONArray jsonSitesArray = json.getJSONArray("sites");
             connection.mSites = getSitesArrayFromJson(jsonSitesArray);
         } catch (JSONException e) {
-            connection.mSites = new int[0];
+            connection.mSites = new long[0];
             e.printStackTrace();
         }
 
         return connection;
     }
 
-    private static int[] getSitesArrayFromJson(JSONArray jsonArray) throws JSONException {
-        int[] sitesArray = new int[jsonArray.length()];
+    private static long[] getSitesArrayFromJson(JSONArray jsonArray) throws JSONException {
+        long[] sitesArray = new long[jsonArray.length()];
         for (int i = 0; i < jsonArray.length(); i++) {
-            sitesArray[i] = jsonArray.getInt(i);
+            sitesArray[i] = jsonArray.getLong(i);
         }
 
         return sitesArray;

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -60,6 +60,9 @@
 import org.wordpress.android.ui.prefs.SiteSettingsFragment;
 import org.wordpress.android.ui.prefs.SiteSettingsInterface;
 import org.wordpress.android.ui.prefs.notifications.NotificationsSettingsFragment;
+import org.wordpress.android.ui.publicize.PublicizeDetailFragment;
+import org.wordpress.android.ui.publicize.PublicizeListFragment;
+import org.wordpress.android.ui.publicize.PublicizeWebViewFragment;
 import org.wordpress.android.ui.reader.ReaderCommentListActivity;
 import org.wordpress.android.ui.reader.ReaderPostDetailFragment;
 import org.wordpress.android.ui.reader.ReaderPostListFragment;
@@ -145,6 +148,10 @@ public interface AppComponent {
     void inject(MediaEditFragment object);
     void inject(MediaPreviewActivity object);
 
+    void inject(PublicizeWebViewFragment object);
+    void inject(PublicizeDetailFragment object);
+    void inject(PublicizeListFragment object);
+
     void inject(EditPostActivity object);
     void inject(EditPostSettingsFragment object);
 

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -131,24 +131,18 @@ public static void viewCurrentBlogPeople(Context context, SiteModel site) {
     }
 
     public static void viewBlogSettingsForResult(Activity activity, SiteModel site) {
-        if (site == null) return;
-    public static void viewBlogSharing(Context context, Blog blog) {
-        if (blog == null) return;
-
-        Intent intent = new Intent(context, PublicizeListActivity.class);
-        intent.putExtra(PublicizeConstants.ARG_SITE_ID, blog.getRemoteBlogId());
-        context.startActivity(intent);
-    }
-
-    public static void viewBlogSettingsForResult(Activity activity, Blog blog) {
-        if (blog == null) return;
-
         Intent intent = new Intent(activity, BlogPreferencesActivity.class);
         intent.putExtra(WordPress.SITE, site);
         activity.startActivityForResult(intent, RequestCodes.SITE_SETTINGS);
         AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.OPENED_BLOG_SETTINGS, site);
     }
 
+    public static void viewBlogSharing(Context context, SiteModel site) {
+        Intent intent = new Intent(context, PublicizeListActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        context.startActivity(intent);
+    }
+
     public static void viewCurrentSite(Context context, SiteModel site, boolean openFromHeader) {
         if (site == null) {
             Toast.makeText(context, context.getText(R.string.blog_not_found), Toast.LENGTH_SHORT).show();

WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java

@@ -249,7 +249,7 @@ public void onClick(View v) {
         mSharingView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                ActivityLauncher.viewBlogSharing(getActivity(), WordPress.getBlog(mBlogLocalId));
+                ActivityLauncher.viewBlogSharing(getActivity(), getSelectedSite());
             }
         });
 
@@ -357,7 +357,7 @@ private void refreshSelectedSiteDetails() {
         mThemesContainer.setVisibility(themesVisibility);
 
         // sharing is only exposed for wp.com blogs
-        int sharingVisibility = blog.isDotcomFlag() ? View.VISIBLE : View.GONE;
+        int sharingVisibility = getSelectedSite().isWPCom() ? View.VISIBLE : View.GONE;
         mSharingView.setVisibility(sharingVisibility);
 
         // show settings for all self-hosted to expose Delete Site