Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-Android into issue/2347-new-approach-views-visitors

6 files changed, 26 insertions, 66 deletions

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsActivity.java
index 3eb47abbb..cb51da028 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsActivity.java
@@ -14,7 +14,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
@@ -34,12 +33,11 @@ import com.android.volley.VolleyError;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.WordPressDB;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.models.Blog;
 import org.wordpress.android.ui.WPDrawerActivity;
 import org.wordpress.android.ui.WPWebViewActivity;
-import org.wordpress.android.ui.accounts.WPComLoginActivity;
+import org.wordpress.android.ui.accounts.SignInActivity;
 import org.wordpress.android.ui.stats.service.StatsService;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -51,6 +49,7 @@ import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.ToastUtils.Duration;
 import org.wordpress.android.util.ptr.SwipeToRefreshHelper;
 import org.wordpress.android.util.ptr.SwipeToRefreshHelper.RefreshListener;
+import org.wordpress.android.util.ptr.CustomSwipeRefreshLayout;
 import org.xmlrpc.android.ApiHelper;
 import org.xmlrpc.android.XMLRPCCallback;
 import org.xmlrpc.android.XMLRPCClientInterface;
@@ -129,7 +128,7 @@ public class StatsActivity extends WPDrawerActivity implements ScrollViewExt.Scr
             });
         }
 
-        mSwipeToRefreshHelper = new SwipeToRefreshHelper(this, (SwipeRefreshLayout) findViewById(R.id.ptr_layout),
+        mSwipeToRefreshHelper = new SwipeToRefreshHelper(this, (CustomSwipeRefreshLayout) findViewById(R.id.ptr_layout),
                 new RefreshListener() {
                     @Override
                     public void onRefreshStarted() {
@@ -421,15 +420,15 @@ public class StatsActivity extends WPDrawerActivity implements ScrollViewExt.Scr
 
     private void startWPComLoginActivity() {
         mResultCode = RESULT_CANCELED;
-        Intent loginIntent = new Intent(this, WPComLoginActivity.class);
-        loginIntent.putExtra(WPComLoginActivity.JETPACK_AUTH_REQUEST, true);
-        startActivityForResult(loginIntent, WPComLoginActivity.REQUEST_CODE);
+        Intent signInIntent = new Intent(this, SignInActivity.class);
+        signInIntent.putExtra(SignInActivity.ARG_JETPACK_SITE_AUTH, mLocalBlogID);
+        startActivityForResult(signInIntent, SignInActivity.REQUEST_CODE);
     }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == WPComLoginActivity.REQUEST_CODE) {
+        if (requestCode == SignInActivity.REQUEST_CODE) {
             mResultCode = resultCode;
             final Blog currentBlog = WordPress.getBlog(mLocalBlogID);
             if (resultCode == RESULT_OK && currentBlog != null && !currentBlog.isDotcomFlag()) {
@@ -571,18 +570,15 @@ public class StatsActivity extends WPDrawerActivity implements ScrollViewExt.Scr
                 return true;
             }
 
-            StatsUtils.StatsCredentials credentials = StatsUtils.getBlogStatsCredentials(mLocalBlogID);
-            if (credentials == null) {
+            String statsAuthenticatedUser = StatsUtils.getBlogStatsUsername(mLocalBlogID);
+            if (statsAuthenticatedUser == null) {
                 Toast.makeText(this, R.string.jetpack_message_not_admin, Toast.LENGTH_LONG).show();
                 return true;
             }
 
-            String statsAuthenticatedUser = credentials.getUsername();
-            String statsAuthenticatedPassword =  credentials.getPassword();
             String addressToLoad = "https://wordpress.com/my-stats/?no-chrome&blog=" + blogId + "&unit=1";
 
-            WPWebViewActivity.openUrlByUsingWPCOMCredentials(this, addressToLoad, statsAuthenticatedUser,
-                    statsAuthenticatedPassword);
+            WPWebViewActivity.openUrlByUsingWPCOMCredentials(this, addressToLoad, statsAuthenticatedUser);
             AnalyticsTracker.track(AnalyticsTracker.Stat.STATS_OPENED_WEB_VERSION);
             return true;
         }
@@ -654,15 +650,11 @@ public class StatsActivity extends WPDrawerActivity implements ScrollViewExt.Scr
             // for self-hosted sites; launch the user into an activity where they can provide their credentials
             if (!currentBlog.isDotcomFlag()
                     && !currentBlog.hasValidJetpackCredentials() && mResultCode != RESULT_CANCELED) {
-                if (WordPress.hasValidWPComCredentials(this)) {
+                if (WordPress.hasDotComToken(this)) {
                     // Let's try the global wpcom credentials them first
                     SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this);
                     String username = settings.getString(WordPress.WPCOM_USERNAME_PREFERENCE, null);
-                    String password = WordPressDB.decryptPassword(
-                            settings.getString(WordPress.WPCOM_PASSWORD_PREFERENCE, null)
-                            );
                     currentBlog.setDotcom_username(username);
-                    currentBlog.setDotcom_password(password);
                     WordPress.wpDB.saveBlog(currentBlog);
                     mSwipeToRefreshHelper.setRefreshing(true);
                 } else {
@@ -687,7 +679,7 @@ public class StatsActivity extends WPDrawerActivity implements ScrollViewExt.Scr
         // check again that we've valid credentials for a Jetpack site
         if (!currentBlog.isDotcomFlag()
                 && !currentBlog.hasValidJetpackCredentials()
-                && !WordPress.hasValidWPComCredentials(this)) {
+                && !WordPress.hasDotComToken(this)) {
             mSwipeToRefreshHelper.setRefreshing(false);
             AppLog.w(T.STATS, "Jetpack blog with no wpcom credentials");
             return;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java
index f70bbf428..bce095c02 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSinglePostDetailsActivity.java
@@ -5,7 +5,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.util.SparseBooleanArray;
@@ -38,6 +37,7 @@ import org.wordpress.android.util.FormatUtils;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.ptr.SwipeToRefreshHelper;
+import org.wordpress.android.util.ptr.CustomSwipeRefreshLayout;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
@@ -99,7 +99,7 @@ public class StatsSinglePostDetailsActivity extends ActionBarActivity
         }
 
         // pull to refresh setup
-        mSwipeToRefreshHelper = new SwipeToRefreshHelper(this, (SwipeRefreshLayout) findViewById(R.id.ptr_layout),
+        mSwipeToRefreshHelper = new SwipeToRefreshHelper(this, (CustomSwipeRefreshLayout) findViewById(R.id.ptr_layout),
                 new SwipeToRefreshHelper.RefreshListener() {
                     @Override
                     public void onRefreshStarted() {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java
index cc531a339..76b1e1f7b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java
@@ -215,7 +215,7 @@ public class StatsUtils {
      */
     public static long getDateDiff(Date date1, Date date2, TimeUnit timeUnit) {
         long diffInMillies = date2.getTime() - date1.getTime();
-        return timeUnit.convert(diffInMillies,TimeUnit.MILLISECONDS);
+        return timeUnit.convert(diffInMillies, TimeUnit.MILLISECONDS);
     }
 
     public static int getSmallestWidthDP() {
@@ -230,49 +230,25 @@ public class StatsUtils {
      * 3. Check that credentials are not empty before launching the activity
      *
      */
-    public static StatsCredentials getBlogStatsCredentials(int localTableBlogID) {
+    public static String getBlogStatsUsername(int localTableBlogID) {
         Blog currentBlog = WordPress.getBlog(localTableBlogID);
         if (currentBlog == null) {
             return null;
         }
         String statsAuthenticatedUser = currentBlog.getDotcom_username();
-        String statsAuthenticatedPassword = currentBlog.getDotcom_password();
 
-        if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedPassword)
-                || org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
+        if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
             // Let's try the global wpcom credentials
             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(WordPress.getContext());
             statsAuthenticatedUser = settings.getString(WordPress.WPCOM_USERNAME_PREFERENCE, null);
-            statsAuthenticatedPassword = WordPressDB.decryptPassword(
-                    settings.getString(WordPress.WPCOM_PASSWORD_PREFERENCE, null)
-            );
         }
 
-        if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedPassword)
-                || org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
+        if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
             AppLog.e(AppLog.T.STATS, "WPCOM Credentials for the current blog are null!");
             return null;
         }
 
-        return new StatsCredentials(statsAuthenticatedUser, statsAuthenticatedPassword);
-    }
-
-    public static class StatsCredentials {
-        private final String mUsername;
-        private final String mPassword;
-
-        public StatsCredentials(String username, String password) {
-            this.mUsername = username;
-            this.mPassword = password;
-        }
-
-        public String getUsername() {
-            return mUsername;
-        }
-
-        public String getPassword() {
-            return mPassword;
-        }
+        return statsAuthenticatedUser;
     }
 
     /**
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewAllActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewAllActivity.java
index 46bf3e18b..05aa95770 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewAllActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewAllActivity.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.view.MenuItem;
@@ -28,6 +27,7 @@ import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.ptr.SwipeToRefreshHelper;
+import org.wordpress.android.util.ptr.CustomSwipeRefreshLayout;
 
 import java.io.Serializable;
 import java.lang.ref.WeakReference;
@@ -85,7 +85,7 @@ public class StatsViewAllActivity extends ActionBarActivity
         }
 
         // pull to refresh setup
-        mSwipeToRefreshHelper = new SwipeToRefreshHelper(this, (SwipeRefreshLayout) findViewById(R.id.ptr_layout),
+        mSwipeToRefreshHelper = new SwipeToRefreshHelper(this, (CustomSwipeRefreshLayout) findViewById(R.id.ptr_layout),
                 new SwipeToRefreshHelper.RefreshListener() {
                     @Override
                     public void onRefreshStarted() {
@@ -474,4 +474,4 @@ public class StatsViewAllActivity extends ActionBarActivity
     public StatsTimeframe getCurrentTimeFrame() {
         return mTimeframe;
     }
-}
\ No newline at end of file
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java
index 8422da00c..5a1eeff80 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java
@@ -81,16 +81,12 @@ public class StatsViewHolder {
                             // Let's try the global wpcom credentials
                             SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(view.getContext());
                             String statsAuthenticatedUser = settings.getString(WordPress.WPCOM_USERNAME_PREFERENCE, null);
-                            String statsAuthenticatedPassword = WordPressDB.decryptPassword(
-                                    settings.getString(WordPress.WPCOM_PASSWORD_PREFERENCE, null)
-                            );
-                            if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedPassword)
-                                    || org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
+                            if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
                                 // Still empty. Do not eat the event, but let's open the default Web Browser.
 
                             }
                             WPWebViewActivity.openUrlByUsingWPCOMCredentials(view.getContext(),
-                                    url, statsAuthenticatedUser, statsAuthenticatedPassword);
+                                    url, statsAuthenticatedUser);
 
                         } else if (url.startsWith("https") || url.startsWith("http")) {
                             AppLog.d(AppLog.T.UTILS, "Opening the in-app browser: " + url);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWPLinkMovementMethod.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWPLinkMovementMethod.java
index 485904cff..e77d73daa 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWPLinkMovementMethod.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWPLinkMovementMethod.java
@@ -64,16 +64,12 @@ public class StatsWPLinkMovementMethod extends WPLinkMovementMethod {
                     // Let's try the global wpcom credentials
                     SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(widget.getContext());
                     String statsAuthenticatedUser = settings.getString(WordPress.WPCOM_USERNAME_PREFERENCE, null);
-                    String statsAuthenticatedPassword = WordPressDB.decryptPassword(
-                            settings.getString(WordPress.WPCOM_PASSWORD_PREFERENCE, null)
-                    );
-                    if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedPassword)
-                            || org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
+                    if (org.apache.commons.lang.StringUtils.isEmpty(statsAuthenticatedUser)) {
                         // Still empty. Do not eat the event, but let's open the default Web Browser.
                         return super.onTouchEvent(widget, buffer, event);
                     }
                     WPWebViewActivity.openUrlByUsingWPCOMCredentials(widget.getContext(),
-                            url, statsAuthenticatedUser, statsAuthenticatedPassword);
+                            url, statsAuthenticatedUser);
                     return true;
                 } else if (url.startsWith("https") || url.startsWith("http")) {
                     AppLog.d(AppLog.T.UTILS, "Opening the in-app browser: " + url);