Curl - DO NOT MERGE

signalapp · May 27, 2020 · 13c5ab2 · 13c5ab2
1 parent 84737fb
commit 13c5ab2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,8 @@ apply plugin: 'com.google.protobuf'
 apply plugin: 'androidx.navigation.safeargs'
 apply plugin: 'witness'
 apply from: 'translations.gradle'
-apply from: 'witness-verifications.gradle'
+//TODO reinstate
+//apply from: 'witness-verifications.gradle'
 
 repositories {
     maven {

diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle
@@ -15,7 +15,8 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 apply plugin: 'witness'
 apply plugin: 'idea'
-apply from: 'witness-verifications.gradle'
+//TODO reinstate
+//apply from: 'witness-verifications.gradle'
 
 sourceCompatibility = 1.8
 archivesBaseName    = "signal-service-java"
@@ -25,6 +26,7 @@ group               = lib_signal_service_group_info
 repositories {
     mavenCentral()
     mavenLocal()
+    jcenter()
 }
 
 dependencies {
@@ -38,6 +40,9 @@ dependencies {
 
     api 'org.signal:zkgroup-java:0.7.0'
 
+//TODO REMOVE
+implementation 'com.github.mrmike:ok2curl:0.6.0'
+
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.assertj:assertj-core:1.7.1'
     testImplementation 'org.conscrypt:conscrypt-openjdk-uber:2.0.0'

diff --git a/...rvice/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/...rvice/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
@@ -10,6 +10,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
+import com.moczul.ok2curl.CurlInterceptor;
 
 import org.signal.storageservice.protos.groups.AvatarUploadAttributes;
 import org.signal.storageservice.protos.groups.Group;
@@ -101,6 +102,7 @@
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
@@ -1432,7 +1434,17 @@ private Response getServiceConnection(String urlFragment, String method, Request
       OkHttpClient            okHttpClient     = baseClient.newBuilder()
                                                            .connectTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
                                                            .readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
-                                                           .build();
+
+//TODO REMOVE
+    .addInterceptor(new CurlInterceptor(message ->{
+      if (StandardCharsets.US_ASCII.newEncoder().canEncode(message)) {
+        Log.v("Ok2Curl", message);
+      } else {
+        Log.v("Ok2Curl", "Can't log this");
+      }
+    }))
+
+    .build();
 
       Log.d(TAG, "Push service URL: " + connectionHolder.getUrl());
       Log.d(TAG, "Opening URL: " + String.format("%s%s", connectionHolder.getUrl(), urlFragment));