Update okhttp and support for transmitting messages over websocket

// FREEBIE

build.gradle

@@ -57,7 +57,7 @@ dependencies {
 
     compile 'org.whispersystems:jobmanager:1.0.2'
     compile 'org.whispersystems:libpastelog:1.0.7'
-    compile 'org.whispersystems:signal-service-android:2.4.4'
+    compile 'org.whispersystems:signal-service-android:2.4.6'
 
     compile 'me.leolin:ShortcutBadger:1.1.0-WS1'
     compile 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -123,7 +123,7 @@ dependencyVerification {
         'com.google.android.gms:play-services-places:abf3a4a3b146ec7e6e753be62775e512868cf37d6f88ffe2d81167b33b57132b',
         'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
         'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88',
-        'org.whispersystems:signal-service-android:27f3f686d9d9f855360307b4b641e666246e7b617020e271df66cb4bdcc26f2a',
+        'org.whispersystems:signal-service-android:737c3e8e572bd5f149d2202d768c4e0f50205f85794e05fee4045d3dfca1fc27',
         'me.leolin:ShortcutBadger:3142d017234bfa0cdd69ccded7cc5ea63f13b97574803c8c616c9bbeaad33ad9',
         'se.emilsjolander:stickylistheaders:a08ca948aa6b220f09d82f16bbbac395f6b78897e9eeac6a9f0b0ba755928eeb',
         'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa',
@@ -157,7 +157,7 @@ dependencyVerification {
         'com.google.android.gms:play-services-basement:95dd882c5ffba15b9a99de3fefb05d3a01946623af67454ca00055d222f85a8d',
         'com.google.android.gms:play-services-iid:54e919f9957b8b7820da7ee9b83471d00d0cac1cf08ddea8b5b41aea80bb1a70',
         'org.whispersystems:signal-protocol-android:1b4b9d557c8eaf861797ff683990d482d4aa8e9f23d9b17ff0cc67a02f38cb19',
-        'org.whispersystems:signal-service-java:df0e83633ff4078cd276838c8942b953f670c61a5f2615ae2a89c75c19fc1bec',
+        'org.whispersystems:signal-service-java:c9b9c8585ba60e391ff08dce2351068b576d3c55531fc46141dfdae8dea20bff',
         'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a',
         'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
         'com.madgag.spongycastle:core:8d6240b974b0aca4d3da9c7dd44d42339d8a374358aca5fc98e50a995764511f',
@@ -166,12 +166,12 @@ dependencyVerification {
         'org.whispersystems:signal-protocol-java:a835cd0609cf116a74651bd0aa748db9392bba48c2d2af787757b8a1b50d131c',
         'com.googlecode.libphonenumber:libphonenumber:7214dc6dfc6243e34fb1a3e02ad15331bfff6ab902d679e3ba337695265c21ca',
         'com.google.protobuf:protobuf-java:e0c1c64575c005601725e7c6a02cebf9e1285e888f756b2a1d73ffa8d725cc74',
-        'com.squareup.okhttp:okhttp:89b7f63e2e5b6c410266abc14f50fe52ea8d2d8a57260829e499b1cd9f0e61af',
         'com.fasterxml.jackson.core:jackson-databind:835097bcdd11f5bc8a08378c70d4c8054dfa4b911691cc2752063c75534d198d',
+        'com.squareup.okhttp3:okhttp:eecd834b09d12c3cd568b811522b97012619f7f00378c3c719a1957fac6458ef',
         'org.whispersystems:curve25519-java:00f1d4919f759055f41f7853a3d475dc7c8decf0dbf045ae93414f8f23b066cc',
-        'com.squareup.okio:okio:5e1098bd3fdee4c3347f5ab815b40ba851e4ab1b348c5e49a5b0362f0ce6e978',
         'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94',
         'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0',
+        'com.squareup.okio:okio:8c5436cadfab36bbd97db5f5c43b7bfdb5bf2f5f894ec8709b1929f14bdd010c',
         'com.android.support:support-media-compat:8d6a1a5ba3d9eb1a25cb8f21bb312ac6280202e3d2900cb0b447d065d0d8a125',
         'com.android.support:support-core-utils:a7649e18c04143dde40c218c5ce9a030e7ae674089cd7b18c6cf8ed2a22cf01a',
         'com.android.support:support-fragment:1294500b357f52cf3779e2521c79f54ae7844f3b9a5f6727495dbbda7f231377',

src/org/thoughtcrime/redphone/signaling/RedPhoneAccountManager.java

@@ -1,11 +1,5 @@
 package org.thoughtcrime.redphone.signaling;
 
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.RequestBody;
-import com.squareup.okhttp.Response;
-
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -22,6 +16,13 @@ import java.security.cert.CertificateException;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509TrustManager;
+
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 
 public class RedPhoneAccountManager {
 
@@ -39,7 +40,9 @@ public class RedPhoneAccountManager {
       this.baseUrl  = baseUrl;
       this.login    = login;
       this.password = password;
-      this.client   = new OkHttpClient().setSslSocketFactory(context.getSocketFactory());
+      this.client   = new OkHttpClient.Builder()
+                                      .sslSocketFactory(context.getSocketFactory(), (X509TrustManager)trustManagers[0])
+                                      .build();
     } catch (NoSuchAlgorithmException | KeyManagementException e) {
       throw new AssertionError(e);
     }

src/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java

@@ -86,6 +86,7 @@ public class SignalCommunicationModule {
                                               TextSecurePreferences.getPushServerPassword(context),
                                               new SignalProtocolStoreImpl(context),
                                               BuildConfig.USER_AGENT,
+                                              Optional.fromNullable(MessageRetrievalService.getPipe()),
                                               Optional.<SignalServiceMessageSender.EventListener>of(new SecurityEventListener(context)));
       }
     };

src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java

@@ -8,9 +8,6 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
 
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
 import org.thoughtcrime.securesms.giph.model.GiphyResponse;
@@ -21,6 +18,10 @@ import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
 public abstract class GiphyLoader extends AsyncLoader<List<GiphyImage>> {
 
   private static final String TAG = GiphyLoader.class.getName();
@@ -29,12 +30,12 @@ public abstract class GiphyLoader extends AsyncLoader<List<GiphyImage>> {
 
   @Nullable private String searchString;
 
-  private final OkHttpClient client = new OkHttpClient();
+  private final OkHttpClient client;
 
   protected GiphyLoader(@NonNull Context context, @Nullable String searchString) {
     super(context);
     this.searchString = searchString;
-    this.client.setProxySelector(new GiphyProxySelector());
+    this.client       = new OkHttpClient.Builder().proxySelector(new GiphyProxySelector()).build();
   }
 
   @Override

src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java

@@ -4,19 +4,23 @@ import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.util.ContentLengthInputStream;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
-import com.squareup.okhttp.ResponseBody;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
 /**
  * Fetches an {@link InputStream} using the okhttp library.
  */
 public class OkHttpStreamFetcher implements DataFetcher<InputStream> {
+
+  private static final String TAG = OkHttpStreamFetcher.class.getName();
+
   private final OkHttpClient client;
   private final GlideUrl     url;
   private       InputStream  stream;
@@ -38,9 +42,10 @@ public class OkHttpStreamFetcher implements DataFetcher<InputStream> {
     }
 
     Request  request  = requestBuilder.build();
-
     Response response = client.newCall(request).execute();
+
     responseBody = response.body();
+
     if (!response.isSuccessful()) {
       throw new IOException("Request failed with code: " + response.code());
     }
@@ -60,11 +65,7 @@ public class OkHttpStreamFetcher implements DataFetcher<InputStream> {
       }
     }
     if (responseBody != null) {
-      try {
       responseBody.close();
-      } catch (IOException e) {
-        // Ignored.
-      }
     }
   }
 

src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java

@@ -7,12 +7,13 @@ import com.bumptech.glide.load.model.GenericLoaderFactory;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
-import com.squareup.okhttp.OkHttpClient;
 
 import org.thoughtcrime.securesms.giph.net.GiphyProxySelector;
 
 import java.io.InputStream;
 
+import okhttp3.OkHttpClient;
+
 /**
  * A simple model loader for fetching media over http/https using OkHttp.
  */
@@ -29,8 +30,9 @@ public class OkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
       if (internalClient == null) {
         synchronized (Factory.class) {
           if (internalClient == null) {
-            internalClient = new OkHttpClient();
+            internalClient = new OkHttpClient.Builder()
-            internalClient.setProxySelector(new GiphyProxySelector());
+                                             .proxySelector(new GiphyProxySelector())
+                                             .build();
           }
         }
       }

src/org/thoughtcrime/securesms/service/MessageRetrievalService.java

@@ -4,6 +4,7 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import org.thoughtcrime.securesms.ApplicationContext;
@@ -44,6 +45,8 @@ public class MessageRetrievalService extends Service implements Runnable, Inject
   private int          activeActivities = 0;
   private List<Intent> pushPending      = new LinkedList<>();
 
+  public static SignalServiceMessagePipe pipe = null;
+
   @Override
   public void onCreate() {
     super.onCreate();
@@ -73,7 +76,7 @@ public class MessageRetrievalService extends Service implements Runnable, Inject
       waitForConnectionNecessary();
 
       Log.w(TAG, "Making websocket connection....");
-      SignalServiceMessagePipe pipe = receiver.createMessagePipe();
+      pipe = receiver.createMessagePipe();
 
       try {
         while (isConnectionNecessary()) {
@@ -181,4 +184,8 @@ public class MessageRetrievalService extends Service implements Runnable, Inject
     intent.setAction(MessageRetrievalService.ACTION_ACTIVITY_FINISHED);
     activity.startService(intent);
   }
+
+  public static @Nullable SignalServiceMessagePipe getPipe() {
+    return pipe;
+  }
 }