4.3.6.1 version, with patched SSLConnectionSocketFactory.java to provide SNI support on Android

Author: smarek

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 

build.sh

@@ -243,6 +243,7 @@ ${SED_CMD} "s/sedpackage/cz\.msebera\.httpclient\.android/g" src/main/AndroidMan
 
 cd ${ANDROIDPROJECTPATH}
 patch ${PACKAGEDIR}/conn/ssl/AbstractVerifier.java ../patches/AbstractVerifier.java.patch.4.3.5
+patch ${PACKAGEDIR}/conn/ssl/SSLConnectionSocketFactory.java ../patches/SSLConnectionSocketFactory.java.patch.4.3.5
 
 echo ">> Gradle build proceed"
 if [ ${INCLUDE_JGSS_API} -eq 1 ]; then

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=4.3.6
-VERSION_CODE=436
+VERSION_NAME=4.3.6.1
+VERSION_CODE=437
 GROUP=cz.msebera.android
 
 POM_ARTIFACT_ID=httpclient

patches/SSLConnectionSocketFactory.java.patch.4.3.5

@@ -0,0 +1,27 @@
+29a30,35
+> import android.os.Build;
+> import android.util.Log;
+> import android.annotation.TargetApi;
+> import java.lang.reflect.InvocationTargetException;
+> import java.lang.reflect.Method;
+> 
+121a128
+>     public static final String TAG   = "SSLConnSockFact";
+289a297,313
+> 
+>         // Android specific code to enable SNI
+>         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+>             if (Log.isLoggable(TAG, Log.DEBUG)) {
+>                 Log.d(TAG, "Enabling SNI for " + target);
+>             }
+>             try {
+>                 Method method = sslsock.getClass().getMethod("setHostname", String.class);
+>                 method.invoke(sslsock, target);
+>             } catch (Exception ex) {
+>                 if (Log.isLoggable(TAG, Log.DEBUG)) {
+>                     Log.d(TAG, "SNI configuration failed", ex);
+>                 }
+>             }
+>         }
+>         // End of Android specific code
+>