From 2b1386232f34278c47c354056bab13caa8d73ad1 Mon Sep 17 00:00:00 2001
From: Curt Brune <curt@signal.org>
Date: Tue, 29 Oct 2019 19:32:23 -0700
Subject: [PATCH] Implement logging interface for ringrtc-0.1.8

Implement the org.signal.ringrtc.Log.Logger interface, using
org.thoughtcrime.securesms.logging.Log as the underlying logger.

This allows ringrtc to log in the same way as the rest of the
application.
---
 build.gradle                                  |  2 +-
 .../securesms/ApplicationContext.java         |  3 +-
 .../securesms/ringrtc/RingRtcLogger.java      | 30 +++++++++++++++++++
 witness-verifications.gradle                  |  4 +--
 4 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 src/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java

diff --git a/build.gradle b/build.gradle
index da29c041c..10a098301 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,7 +99,7 @@ dependencies {
 
     implementation 'org.whispersystems:signal-service-android:2.14.0'
 
-    implementation 'org.signal:ringrtc-android:0.1.7.2'
+    implementation 'org.signal:ringrtc-android:0.1.8'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 095deb2cd..9b1d90e0a 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -64,6 +64,7 @@ import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
+import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.service.IncomingMessageObserver;
@@ -319,7 +320,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
         WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
       }
 
-      CallConnectionFactory.initialize(this);
+      CallConnectionFactory.initialize(this, new RingRtcLogger());
     } catch (UnsatisfiedLinkError e) {
       Log.w(TAG, e);
     }
diff --git a/src/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java b/src/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java
new file mode 100644
index 000000000..33f66189f
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/ringrtc/RingRtcLogger.java
@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.ringrtc;
+
+import org.thoughtcrime.securesms.logging.Log;
+
+public class RingRtcLogger implements org.signal.ringrtc.Log.Logger {
+  @Override
+  public void v(String tag, String message, Throwable t) {
+    Log.v(tag, message, t);
+  }
+
+  @Override
+  public void d(String tag, String message, Throwable t) {
+    Log.d(tag, message, t);
+  }
+
+  @Override
+  public void i(String tag, String message, Throwable t) {
+    Log.i(tag, message, t);
+  }
+
+  @Override
+  public void w(String tag, String message, Throwable t) {
+    Log.w(tag, message, t);
+  }
+
+  @Override
+  public void e(String tag, String message, Throwable t) {
+    Log.e(tag, message, t);
+  }
+}
diff --git a/witness-verifications.gradle b/witness-verifications.gradle
index be3c9ce97..bd744e78b 100644
--- a/witness-verifications.gradle
+++ b/witness-verifications.gradle
@@ -351,8 +351,8 @@ dependencyVerification {
         ['org.signal:android-database-sqlcipher:3.5.9-S3',
          '33d4063336893af00b9d68b418e7b290cace74c20ce8aacffddc0911010d3d73'],
 
-        ['org.signal:ringrtc-android:0.1.7.2',
-         '7b39083b011ac754117d2b74e26ec8323278ece7656be3ba8c766cae523d378f'],
+        ['org.signal:ringrtc-android:0.1.8',
+         '2ef2666564b90e2a7dad53a42ca8febb8dc828ddd7a2d442b8b5e966571606b6'],
 
         ['org.signal:signal-metadata-android:0.0.5',
          'e79ca9231ec07b05849bc048c643fe2cec48ee781ba5aa8165847a3c90178684'],