Merge remote-tracking branch 'origin/develop' into feature/people-management-sync

Author: oguzkocer

WordPress/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.1.0'
         classpath 'io.fabric.tools:gradle:1.+'
     }
 }
@@ -13,6 +13,7 @@ repositories {
     jcenter()
     maven { url 'http://wordpress-mobile.github.io/WordPress-Android' }
     maven { url 'https://maven.fabric.io/public' }
+    maven { url 'http://dl.bintray.com/optimizely/optimizely' }
 }
 
 apply plugin: 'com.android.application'
@@ -75,6 +76,10 @@ dependencies {
         transitive = true;
     }
 
+    compile('com.optimizely:optimizely:+@aar') {
+        transitive = true
+    }
+
     // Provided by maven central
     compile ('org.wordpress:mediapicker:1.2.4') {
         exclude group:'com.android.support'

WordPress/gradle.properties-example

@@ -4,6 +4,7 @@ wp.oauth.redirect_uri = http://android.wordpress.org/
 wp.gcm.id = wordpress
 wp.db_secret = wordpress
 wp.mixpanel_token = wordpress
+wp.optimizely_token = wordpress
 wp.simperium.app_secret = wordpress
 wp.simperium.app_name = wordpress
 wp.helpshift.api.key = wordpress

WordPress/lint.xml

@@ -8,6 +8,9 @@
         <warning path="src/main/res/values/reader_styles.xml" />
         <warning path="src/main/res/values/styles.xml" />
     </issue>
+    <issue id="InvalidPackage">
+        <ignore regexp="okio-1.6.0.jar" />
+    </issue>
 
     <issue id="HardcodedText" severity="error" />
     <issue id="IconDuplicates" severity="error" />

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

@@ -1,6 +1,7 @@
 package org.wordpress.android.models;
 
 import android.content.Context;
+import android.text.Spanned;
 import android.text.TextUtils;
 
 import org.json.JSONObject;
@@ -182,11 +183,12 @@ public java.util.Date getDatePublished() {
         return dtPublished;
     }
 
-    private transient String unescapedCommentText;
-    public String getUnescapedCommentText() {
-        if (unescapedCommentText == null)
-            unescapedCommentText = StringUtils.unescapeHTML(getCommentText()).trim();
-        return unescapedCommentText;
+    private transient Spanned unescapedCommentWithDrawables;
+    public void setUnescapedCommentWithDrawables(Spanned spanned){
+        unescapedCommentWithDrawables = spanned;
+    }
+    public Spanned getUnescapedCommentTextWithDrawables() {
+        return unescapedCommentWithDrawables;
     }
 
     private transient String unescapedPostTitle;
@@ -238,4 +240,5 @@ public boolean willTrashingPermanentlyDelete(){
         CommentStatus status = getStatusEnum();
         return CommentStatus.TRASH.equals(status) || CommentStatus.SPAM.equals(status);
     }
+
 }

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

@@ -180,11 +180,12 @@ public String getLabel() {
     }
 
     @Override
-    public boolean equals(Object tag){
-        if (tag == null) return false;
-
-        if (!ReaderTag.class.isAssignableFrom(tag.getClass())) return false;
-
-        return getLabel().equals(((ReaderTag) tag).getLabel());
+    public boolean equals(Object object){
+        if (object instanceof ReaderTag) {
+            ReaderTag tag = (ReaderTag) object;
+            return (tag.tagType == this.tagType && tag.getLabel().equals(this.getLabel()));
+        } else {
+            return false;
+        }
     }
 }

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

@@ -4,11 +4,15 @@
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.optimizely.Optimizely;
+
+import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.ui.main.WPMainActivity;
 import org.wordpress.android.util.ProfilingUtils;
 import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.util.WPOptimizelyEventListener;
 
 public class WPLaunchActivity extends Activity {
 
@@ -30,9 +34,16 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
+        configureOptimizely();
+
         Intent intent = new Intent(this, WPMainActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);
         finish();
     }
+
+    private void configureOptimizely() {
+        Optimizely.addOptimizelyEventListener(new WPOptimizelyEventListener());
+        Optimizely.startOptimizelyWithAPIToken(BuildConfig.OPTIMIZELY_TOKEN, getApplication());
+    }
 }

WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java

@@ -41,6 +41,8 @@
 import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
 import com.google.android.gms.common.api.ResultCallback;
 import com.google.android.gms.common.api.Status;
+import com.optimizely.Optimizely;
+import com.optimizely.Variable.LiveVariable;
 import com.wordpress.rest.RestRequest;
 
 import org.json.JSONException;
@@ -86,6 +88,7 @@
 
 public class SignInFragment extends AbstractFragment implements TextWatcher, ConnectionCallbacks,
         OnConnectionFailedListener {
+    private static LiveVariable<Boolean> isNotOnWordPressComVariable = Optimizely.booleanForKey("isNotOnWordPressCom", false);
     private static final String DOT_COM_BASE_URL = "https://wordpress.com";
     private static final String FORGOT_PASSWORD_RELATIVE_URL = "/wp-login.php?action=lostpassword";
     private static final int WPCOM_ERRONEOUS_LOGIN_THRESHOLD = 3;
@@ -171,6 +174,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mCreateAccountButton = (WPTextView) rootView.findViewById(R.id.nux_create_account_button);
         mCreateAccountButton.setOnClickListener(mCreateAccountListener);
         mAddSelfHostedButton = (WPTextView) rootView.findViewById(R.id.nux_add_selfhosted_button);
+        setDotComAddSelfHostedButtonText();
         mAddSelfHostedButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -224,7 +228,6 @@ public void onClick(View v) {
         initInfoButtons(rootView);
         moveBottomButtons();
         initSmartLockForPasswords();
-
         return rootView;
     }
 
@@ -240,7 +243,15 @@ private void toggleSignInMode(){
 
     private void showDotComSignInForm(){
         mUrlButtonLayout.setVisibility(View.GONE);
-        mAddSelfHostedButton.setText(getString(R.string.nux_add_selfhosted_blog));
+        setDotComAddSelfHostedButtonText();
+    }
+
+    private void setDotComAddSelfHostedButtonText() {
+        if (isNotOnWordPressComVariable.get()) {
+            mAddSelfHostedButton.setText(R.string.not_on_wordpress_com);
+        } else {
+            mAddSelfHostedButton.setText(getString(R.string.nux_add_selfhosted_blog));
+        }
     }
 
     private void showSelfHostedSignInForm(){
@@ -310,7 +321,9 @@ private void initSmartLockForPasswords() {
     }
 
     public void smartLockAutoFill() {
-        if (!isGooglePlayServicesAvailable() || mCredentialsClient == null) {
+        // We don't want to autofill username and password fields if self hosted has been selected (pre-selected or
+        // user selected).
+        if (!isGooglePlayServicesAvailable() || mCredentialsClient == null || mSelfHosted) {
             return;
         }
         CredentialRequest credentialRequest = new CredentialRequest.Builder()

WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java

@@ -1,9 +1,14 @@
 package org.wordpress.android.ui.comments;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,8 +24,13 @@
 import org.wordpress.android.util.AniUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.DateTimeUtils;
+import org.wordpress.android.util.ImageUtils;
+import org.wordpress.android.util.StringUtils;
+import org.wordpress.android.util.WPHtml;
 import org.wordpress.android.widgets.WPNetworkImageView;
 
+import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -44,6 +54,7 @@ interface OnCommentPressedListener {
     }
 
     private final LayoutInflater mInflater;
+    private final Context mContext;
 
     private final CommentList mComments = new CommentList();
     private final HashSet<Integer> mSelectedPositions = new HashSet<>();
@@ -110,6 +121,7 @@ public boolean onLongClick(View v) {
 
     CommentAdapter(Context context, int localBlogId) {
         mInflater = LayoutInflater.from(context);
+        mContext = context;
 
         mLocalBlogId = localBlogId;
 
@@ -163,7 +175,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) {
         }
 
         holder.txtTitle.setText(Html.fromHtml(comment.getFormattedTitle()));
-        holder.txtComment.setText(comment.getUnescapedCommentText());
+        holder.txtComment.setText(comment.getUnescapedCommentTextWithDrawables());
         holder.txtDate.setText(DateTimeUtils.javaDateToTimeSpan(comment.getDatePublished()));
 
         // status is only shown for comments that haven't been approved
@@ -416,10 +428,14 @@ protected Boolean doInBackground(Void... params) {
             // pre-calc transient values so they're cached prior to display
             for (Comment comment: tmpComments) {
                 comment.getDatePublished();
-                comment.getUnescapedCommentText();
                 comment.getUnescapedPostTitle();
                 comment.getAvatarForDisplay(mAvatarSz);
                 comment.getFormattedTitle();
+
+                String content = StringUtils.notNullStr(comment.getCommentText());
+                //to load images embedded within comments, pass an ImageGetter to WPHtml.fromHtml()
+                Spanned spanned = WPHtml.fromHtml(content, null, null, mContext, null, 0);
+                comment.setUnescapedCommentWithDrawables(spanned);
             }
 
             return true;
@@ -439,4 +455,5 @@ protected void onPostExecute(Boolean result) {
             mIsLoadTaskRunning = false;
         }
     }
+
 }