Merge remote-tracking branch 'origin/develop' into issue/985-make-sfa…

…ctory-private

Conflicts:
	WordPress/src/androidTest/java/org/wordpress/android/ActivityRobotiumTestCase.java

WordPressUtils/build.gradle

@@ -19,16 +19,14 @@ repositories {
 dependencies {
     compile 'commons-lang:commons-lang:2.6'
     compile 'com.mcxiaoke.volley:library:1.0.+'
-    compile 'com.github.castorflex.smoothprogressbar:library:0.4.0'
-    compile 'org.wordpress:pulltorefresh-main:0.9.7@aar' // org.wordpress version includes some fixes
-    compile 'com.android.support:support-v13:19.1.0'
+    compile 'com.android.support:support-v13:21.0.2'
 }
 
 android {
     publishNonDefault true
 
     compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    buildToolsVersion "21.1.1"
 
     defaultConfig {
         applicationId "org.wordpress.android.util"

WordPressUtils/src/main/java/org/wordpress/android/util/ActivityUtils.java

@@ -0,0 +1,16 @@
+package org.wordpress.android.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.inputmethod.InputMethodManager;
+
+public class ActivityUtils {
+    public static void hideKeyboard(Activity activity) {
+        if (activity != null && activity.getCurrentFocus() != null) {
+            InputMethodManager inputManager = (InputMethodManager) activity.getSystemService(
+                    Context.INPUT_METHOD_SERVICE);
+            inputManager.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(),
+                    InputMethodManager.HIDE_NOT_ALWAYS);
+        }
+    }
+}

WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtil.java

@@ -232,25 +232,4 @@ public static JSONObject getJSONChild(final JSONObject jsonParent, final String
         }
         return jsonChild;
     }
-
-    // Returns a copy of the passed JSONObject
-    @SuppressWarnings("unchecked")
-    public static JSONObject copyJSONObject(JSONObject object) {
-        JSONObject objectCopy = new JSONObject();
-
-        if (object == null) return objectCopy;
-
-        Iterator<String> iterator = object.keys();
-        while (iterator.hasNext()) {
-            try {
-                String key = iterator.next();
-                Object value = object.get(key);
-                objectCopy.put(key, value);
-            } catch (JSONException e) {
-                AppLog.e(T.UTILS, e);
-            }
-        }
-
-        return objectCopy;
-    }
 }