E2-1790 android socket fix (#348)

* check https instead of wss

* add tests

* isSecure public for tests

* try importing WebSocketClient bc test failing

* try removing test for build

* comment out test methods

* try commenting out robolectric

* does adding config work?

* add more configs

* change config

* copy over another test calss

* add one passing test

* add real tests

(cherry picked from commit 005b4c0)

Author: gg4race

AndroidSDKCore/src/main/java/com/leanplum/internal/Socket.java

@@ -81,6 +81,9 @@ private void createSocketClient() {
       @Override
       public void onError(Exception error) {
         Log.e("Development socket error", error);
+
+        // if error happens during connecting, reset flag
+        connecting = false;
       }
 
       @Override

AndroidSDKCore/src/main/java/com/leanplum/internal/WebSocketClient.java

@@ -99,24 +99,23 @@ public void connect() {
       @Override
       public void run() {
         try {
-          int port = (mURI.getPort() != -1) ? mURI.getPort() : (mURI.getScheme().equals("wss") ? 443 : 80);
+          int port = (mURI.getPort() != -1) ? mURI.getPort() : (isSecure() ? 443 : 80);
 
           String path = TextUtils.isEmpty(mURI.getPath()) ? "/" : mURI.getPath();
           if (!TextUtils.isEmpty(mURI.getQuery())) {
             path += "?" + mURI.getQuery();
           }
 
-          String originScheme = mURI.getScheme().equals("wss") ? "https" : "http";
           URI origin = null;
           try {
-            origin = new URI(originScheme, "//" + mURI.getHost(), null);
+            origin = new URI(mURI.getScheme(), "//" + mURI.getHost(), null);
           } catch (URISyntaxException e) {
             Util.handleException(e);
           }
 
           SocketFactory factory;
           try {
-            factory = mURI.getScheme().equals("wss") ? getSSLSocketFactory() : SocketFactory.getDefault();
+            factory = isSecure() ? getSSLSocketFactory() : SocketFactory.getDefault();
           } catch (GeneralSecurityException e) {
             Util.handleException(e);
             return;
@@ -186,6 +185,10 @@ public void run() {
     mThread.start();
   }
 
+  public boolean isSecure() {
+    return mURI.getScheme().equals("https");
+  }
+
   public void disconnect() {
     if (mSocket != null) {
       mHandler.post(new Runnable() {

AndroidSDKTests/src/test/java/com/leanplum/internal/WebSocketClientTest.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright 2019, Leanplum, Inc. All rights reserved.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.leanplum.internal;
+
+import com.leanplum.Leanplum;
+import com.leanplum.__setup.LeanplumTestApp;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.rule.PowerMockRule;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.powermock.api.mockito.PowerMockito.spy;
+
+/**
+ * Tests for {@link WebSocketClient} class.
+ *
+ * @author Grace Gu
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(
+    sdk = 16,
+    application = LeanplumTestApp.class
+)
+@PowerMockIgnore({
+    "org.mockito.*",
+    "org.robolectric.*",
+    "org.json.*",
+    "org.powermock.*",
+    "android.*"
+})
+@PrepareForTest({Leanplum.class, Util.class, WebSocketClient.class, RequestOld.class})
+public class WebSocketClientTest {
+  @Rule
+  public PowerMockRule rule = new PowerMockRule();
+
+  /**
+   * Runs before every test case.
+   */
+  @Before
+  public void setUp() {
+    spy(WebSocketClient.class);
+  }
+
+  // java doesn't support wss so we expect WebSocketClient to respect http vs https
+  @Test
+  public void testIsSecure() throws URISyntaxException {
+    WebSocketClient webSocketClient = new WebSocketClient(new URI("https://dev.leanplum.com"), null, null);
+    assertTrue(webSocketClient.isSecure());
+    assertTrue(true);
+  }
+
+  @Test
+  public void testIsNotSecure() throws URISyntaxException {
+    WebSocketClient webSocketClient = new WebSocketClient(new URI("http://dev.leanplum.com"), null, null);
+    assertFalse(webSocketClient.isSecure());
+  }
+}