TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 06:52:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Temporary revert to fix an avatar retrieval issue."

Browse Source 
This reverts commit 267bc32e23.
This commit is contained in:
Greyson Parrelli
2019-04-17 15:41:36 -04:00
parent 30ba9d7e27
commit 77524ae1f2
6 changed files with 27 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/attachments/AttachmentServer.java
View File

@@ -4,10 +4,10 @@ package org.thoughtcrime.securesms.attachments;
import android.content.Context;
import android.net.Uri;
import android.support.annotation.NonNull;
import org.thoughtcrime.securesms.logging.Log;
import org.spongycastle.util.encoders.Hex;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.mms.PartAuthority;
import org.thoughtcrime.securesms.util.Hex;
import org.thoughtcrime.securesms.util.Util;
import java.io.BufferedOutputStream;
@@ -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) {