TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-30 05:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for expanded domain fronting strategies

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2016-12-29 20:54:05 -08:00
parent 7488525641
commit ae40715526
8 changed files with 106 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/org/thoughtcrime/securesms/push/AccountManagerFactory.java
View File

@@ -1,50 +1,24 @@
package org.thoughtcrime.securesms.push;
import android.content.Context;
import android.support.annotation.NonNull;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.signalservice.api.SignalServiceAccountManager;
import org.whispersystems.signalservice.api.push.TrustStore;
import org.whispersystems.signalservice.internal.push.SignalServiceUrl;
public class AccountManagerFactory {
public static SignalServiceAccountManager createManager(Context context) {
return new SignalServiceAccountManager(getUrl(context), getTrustStore(context),
return new SignalServiceAccountManager(new SignalServiceNetworkAccess(context).getConfiguration(context),
TextSecurePreferences.getLocalNumber(context),
TextSecurePreferences.getPushServerPassword(context),
BuildConfig.USER_AGENT);
}
public static SignalServiceAccountManager createManager(Context context, String number, String password) {
return new SignalServiceAccountManager(getUrl(number), getTrustStore(context, number),
return new SignalServiceAccountManager(new SignalServiceNetworkAccess(context).getConfiguration(number),
number, password, BuildConfig.USER_AGENT);
}
private static SignalServiceUrl getUrl(@NonNull Context context) {
return getUrl(TextSecurePreferences.getLocalNumber(context));
}
private static TrustStore getTrustStore(@NonNull Context context) {
return getTrustStore(context, TextSecurePreferences.getLocalNumber(context));
}
private static SignalServiceUrl getUrl(@NonNull String number) {
if (Censorship.isCensored(number)) {
return new SignalServiceUrl(BuildConfig.UNCENSORED_FRONTING_HOST, BuildConfig.CENSORED_REFLECTOR);
} else {
return new SignalServiceUrl(BuildConfig.TEXTSECURE_URL, null);
}
}
private static TrustStore getTrustStore(@NonNull Context context, @NonNull String number) {
if (Censorship.isCensored(number)) {
return new CensorshipFrontingTrustStore(context);
} else {
return new SignalServiceTrustStore(context);
}
}
}