TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-22 17:40:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'groups' of github.com:WhisperSystems/TextSecure into groups

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-02-03 11:52:27 -08:00
parent 0ace469d74 9fd2c4753e
commit 0af473d880
44 changed files with 1040 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/src/org/whispersystems/textsecure/directory/Directory.java
View File

@@ -41,11 +41,16 @@ public class Directory {
SUPPORTS_SMS + " INTEGER, " +
TIMESTAMP + " INTEGER);";
private static Directory instance;
private static final Object instanceLock = new Object();
private static volatile Directory instance;
public synchronized static Directory getInstance(Context context) {
public static Directory getInstance(Context context) {
if (instance == null) {
instance = new Directory(context);
synchronized (instanceLock) {
if (instance == null) {
instance = new Directory(context);
}
}
}
return instance;

2
library/src/org/whispersystems/textsecure/push/PushServiceSocket.java
View File

@@ -50,7 +50,7 @@ public class PushServiceSocket {
private static final String MESSAGE_PATH = "/v1/messages/%s";
private static final String ATTACHMENT_PATH = "/v1/attachments/%s";
private static final boolean ENFORCE_SSL = false;
private static final boolean ENFORCE_SSL = true;
private final Context context;
private final String serviceUrl;