From cf45c566bac0e1f2b03f730a2d75c2a673962d99 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 11 Dec 2018 00:02:48 +0100
Subject: [PATCH] remove tiny dependency to spongycastle/bouncycastle

---
 build.gradle                                                  | 1 +
 .../thoughtcrime/securesms/attachments/AttachmentServer.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 27be1e4df..1440a5480 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,6 +75,7 @@ dependencies {
     compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
 
     compile 'org.whispersystems:signal-service-android:2.7.6'
+    //compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5'
 
     compile 'com.journeyapps:zxing-android-embedded:3.4.0'
 
diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java
index 9fdb0bd7b..359bcd7b0 100644
--- a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java
+++ b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java
@@ -6,9 +6,9 @@ import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.util.Log;
 
-import org.spongycastle.util.encoders.Hex;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.Hex;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -52,7 +52,7 @@ public class AttachmentServer implements Runnable {
       this.attachment   = attachment;
       this.socket       = new ServerSocket(0, 0, InetAddress.getByAddress(new byte[]{127, 0, 0, 1}));
       this.port         = socket.getLocalPort();
-      this.auth         = new String(Hex.encode(Util.getSecretBytes(16)));
+      this.auth         = Hex.toStringCondensed(Util.getSecretBytes(16));
 
       this.socket.setSoTimeout(5000);
     } catch (UnknownHostException e) {