Merge branch 'release/5.9' into develop

8 files changed, 26 insertions, 28 deletions

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 05e2d445f..27d60929b 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -98,20 +98,21 @@ dependencies {
     compile 'com.google.android.gms:play-services-gcm:9.0.2'
     compile 'com.google.android.gms:play-services-auth:9.0.2'
     compile 'com.github.chrisbanes.photoview:library:1.2.4'
-    compile 'com.helpshift:android-helpshift-aar:4.4.0'
+    compile 'com.helpshift:android-helpshift-aar:4.7.0'
     compile 'de.greenrobot:eventbus:2.4.0'
     compile 'com.automattic:rest:1.0.7'
     compile 'org.wordpress:graphview:3.4.0'
     compile 'org.wordpress:persistentedittext:1.0.1'
     compile 'org.wordpress:emailchecker2:1.1.0'
 
-    compile 'com.yalantis:ucrop:1.5.0'
+    compile 'com.yalantis:ucrop:2.2.0'
     compile 'com.github.xizzhu:simple-tool-tip:0.5.0'
 
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'
     androidTestCompile 'org.objenesis:objenesis:2.1'
     androidTestCompile 'org.mockito:mockito-core:+'
     androidTestCompile 'com.squareup.okhttp:mockwebserver:2.7.5'
+    androidTestCompile 'com.squareup.okio:okio:1.9.0' // explicitly compile okio to match the version needed by ucrop
 
     // Provided by the WordPress-Android Repository
     compile 'org.wordpress:drag-sort-listview:0.6.1' // not found in maven central
diff --git a/WordPress/lint.xml b/WordPress/lint.xml
index d912c2644..02a1dcb73 100644
--- a/WordPress/lint.xml
+++ b/WordPress/lint.xml
@@ -5,7 +5,7 @@
     <issue id="RtlCompat" severity="warning" />
 
     <issue id="InvalidPackage">
-        <ignore regexp="okio-1.6.0.jar" />
+        <ignore regexp="okio-1.9.0.jar" />
     </issue>
 
     <issue id="NewApi">
diff --git a/WordPress/proguard.cfg b/WordPress/proguard.cfg
index 0fe5a991c..615537188 100644
--- a/WordPress/proguard.cfg
+++ b/WordPress/proguard.cfg
@@ -24,3 +24,7 @@
 
 -keepattributes Signature
 -keepattributes *Annotation*
+
+-dontwarn com.yalantis.ucrop**
+-keep class com.yalantis.ucrop** { *; }
+-keep interface com.yalantis.ucrop** { *; }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java b/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java
index cc0bc3262..baf95bc1b 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/HelpshiftHelper.java
@@ -7,6 +7,8 @@ import android.content.Intent;
 import android.text.TextUtils;
 
 import com.helpshift.Core;
+import com.helpshift.InstallConfig;
+import com.helpshift.exceptions.InstallException;
 import com.helpshift.support.Support;
 import com.helpshift.support.Support.Delegate;
 
@@ -16,6 +18,7 @@ import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.models.AccountHelper;
+import org.wordpress.android.util.AppLog.T;
 
 import java.io.File;
 import java.util.HashMap;
@@ -84,11 +87,16 @@ public class HelpshiftHelper {
     }
 
     public static void init(Application application) {
-        HashMap<String, Boolean> config = new HashMap<String, Boolean>();
-        config.put("enableInAppNotification", false);
+        InstallConfig installConfig = new InstallConfig.Builder()
+                .setEnableInAppNotification(true)
+                .build();
         Core.init(Support.getInstance());
-        Core.install(application, BuildConfig.HELPSHIFT_API_KEY, BuildConfig.HELPSHIFT_API_DOMAIN,
-                BuildConfig.HELPSHIFT_API_ID, config);
+        try {
+            Core.install(application, BuildConfig.HELPSHIFT_API_KEY, BuildConfig.HELPSHIFT_API_DOMAIN,
+                    BuildConfig.HELPSHIFT_API_ID, installConfig);
+        } catch (InstallException e) {
+            AppLog.e(T.UTILS, e);
+        }
         Support.setDelegate(new Delegate() {
             @Override
             public void sessionBegan() {
diff --git a/WordPress/src/main/res/values/available_languages.xml b/WordPress/src/main/res/values/available_languages.xml
index f045ebcb2..cc7be32a9 100644
--- a/WordPress/src/main/res/values/available_languages.xml
+++ b/WordPress/src/main/res/values/available_languages.xml
@@ -179,6 +179,10 @@ ms
 es_VE
 </item>
 
+<item>
+gl
+</item>
+
 </string-array>
 </resources>
 
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java
index 760d94c6e..70a995b01 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/ImageSettingsDialogFragment.java
@@ -214,10 +214,6 @@ public class ImageSettingsDialogFragment extends DialogFragment {
     }
 
     private ActionBar getActionBar() {
-        if (!isAdded()) {
-            return null;
-        }
-
         if (getActivity() instanceof AppCompatActivity) {
             return ((AppCompatActivity) getActivity()).getSupportActionBar();
         } else {
diff --git a/tools/exported-language-codes.csv b/tools/exported-language-codes.csv
index 074d02c10..8eca85d08 100644
--- a/tools/exported-language-codes.csv
+++ b/tools/exported-language-codes.csv
@@ -42,3 +42,4 @@ cs,cs,Czech
 en-ca,en-rCA,English(Canada)
 ms,ms,Malay
 es-ve,es-rVE,Spanish(Venezuela)
+gl,gl,Galician
diff --git a/tools/release-checks.sh b/tools/release-checks.sh
index b25014e9c..a16bee401 100755
--- a/tools/release-checks.sh
+++ b/tools/release-checks.sh
@@ -27,21 +27,6 @@ function pFail() {
 	echo "[$(tput setaf 1)KO$(tput sgr0)]"
 }
 
-function checkSamsungWorkaround() {
-	/bin/echo -n "Check for the Samsung android.support.v7.view.menu workaround..."
-	apktool > /dev/null 2>&1 || (pFail; echo "You need apktool installed to run this check (brew install apktool)"; exit 1) || exit 4
-	./gradlew clean --offline > /dev/null 2>&1
-	./gradlew assembleVanillaRelease --offline > /dev/null 2>&1
-	rm -rf /tmp/wpandroid-checksamsungworkaround/
-	apktool -f -r d WordPress/build/outputs/apk/WordPress-vanilla-release-unaligned.apk -o /tmp/wpandroid-checksamsungworkaround/ > /dev/null && ls -1 /tmp/wpandroid-checksamsungworkaround/smali/android/support/v7/view/menu/MenuBuilder* > /dev/null 2>&1
-	if [ $? -eq 0 ]; then
-		pFail
-		echo "See http://stackoverflow.com/q/24809580/58332 for more informations"
-		exit 4
-	fi
-	pOk
-}
-
 function checkENStrings() {
 	if [[ -n $(git status --porcelain|grep "M res") ]]; then
 		/bin/echo -n "Unstagged changes detected in $RESDIR/ - can't continue..."
@@ -101,8 +86,7 @@ function checkGradleProperties() {
 }
 
 checkNewLanguages
-checkENStrings
-checkSamsungWorkaround
+# checkENStrings
 checkGradleProperties
 printVersion
 # checkDeviceToTest