From e3ea36c76fe364e5637b2cbf7f13992ebdccacf1 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 19 Mar 2020 10:04:04 -0400
Subject: [PATCH] Remove unnecessary okhttp close when canceling.

Canceling should handle closing stuff now. And if we close from a
different thread than the calling thread, okhttp will crash.
---
 .../glide/cache/EncryptedCacheEncoder.java         |  9 ++++++---
 .../securesms/net/CallRequestController.java       | 14 +++-----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
index 361f7bba9..1d546ccf5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
@@ -13,6 +13,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.SocketException;
 
 public class EncryptedCacheEncoder extends EncryptedCoder implements Encoder<InputStream> {
 
@@ -42,12 +43,14 @@ public class EncryptedCacheEncoder extends EncryptedCoder implements Encoder<Inp
 
       return true;
     } catch (IOException e) {
-      Log.w(TAG, e);
+      if (e instanceof SocketException) {
+        Log.d(TAG, "Socket exception. Likely a cancellation.");
+      } else {
+        Log.w(TAG, e);
+      }
       return false;
     } finally {
       byteArrayPool.put(buffer);
     }
   }
-
-
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java b/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java
index 034fc3189..4d4c69c09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java
@@ -4,6 +4,7 @@ import android.os.AsyncTask;
 import androidx.annotation.NonNull;
 import androidx.annotation.WorkerThread;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
 
@@ -27,24 +28,15 @@ public class CallRequestController implements RequestController {
     AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
       synchronized (CallRequestController.this) {
         if (canceled) return;
-        
+
         call.cancel();
-
-        if (stream != null) {
-          Util.close(stream);
-        }
-
         canceled = true;
       }
     });
   }
 
   public synchronized void setStream(@NonNull InputStream stream) {
-    if (canceled) {
-      Util.close(stream);
-    } else {
-      this.stream = stream;
-    }
+    this.stream = stream;
     notifyAll();
   }