Merge branch 'hotfix/WssFix'

Author: smartarmenia

app/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
     defaultConfig {
         applicationId "com.smartarmenia.websocketclient"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.2.30'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'

dotnetcoresignalrclient/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.00 24sep2017"
     }

dotnetcoresignalrclientjava/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
 
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 10
         versionName "1.09"
     }

dotnetcoresignalrclientjava/src/main/java/com/smartarmenia/dotnetcoresignalrclientjava/WebSocketHubConnection.java

@@ -24,6 +24,8 @@
 import java.util.Map;
 import java.util.UUID;
 
+import javax.net.ssl.SSLSocketFactory;
+
 public class WebSocketHubConnection implements HubConnection {
     private static String SPECIAL_SYMBOL = "\u001E";
     private static String TAG = "WebSockets";
@@ -161,10 +163,13 @@ public void onError(Exception ex) {
                     error(ex);
                 }
             };
+
+            if (parsedUri.getScheme().equals("https")) {
+                client.setSocket(SSLSocketFactory.getDefault().createSocket());
+            }
         } catch (Exception e) {
             error(e);
         }
-
         Log.i(TAG, "Connecting...");
         client.connect();
     }