More RedPhone cleanup

Closes #6393
// FREEBIE
This commit is contained in:
Paride Legovini 2017-03-15 15:04:10 +01:00 committed by Moxie Marlinspike
parent 52b1e17c36
commit 1c9715f700
2 changed files with 0 additions and 8 deletions

View File

@ -212,9 +212,6 @@ android {
buildConfigField "String", "GIPHY_PROXY_HOST", "\"giphy-proxy-production.whispersystems.org\"" buildConfigField "String", "GIPHY_PROXY_HOST", "\"giphy-proxy-production.whispersystems.org\""
buildConfigField "int", "GIPHY_PROXY_PORT", "80" buildConfigField "int", "GIPHY_PROXY_PORT", "80"
buildConfigField "String", "USER_AGENT", "\"OWA\"" buildConfigField "String", "USER_AGENT", "\"OWA\""
buildConfigField "String", "REDPHONE_MASTER_URL", "\"https://redphone-master.whispersystems.org\""
buildConfigField "String", "REDPHONE_RELAY_HOST", "\"relay.whispersystems.org\""
buildConfigField "String", "REDPHONE_PREFIX_NAME", "\".whispersystems.org\""
buildConfigField "boolean", "DEV_BUILD", "false" buildConfigField "boolean", "DEV_BUILD", "false"
} }

View File

@ -21,7 +21,6 @@ public class RefreshAttributesJob extends ContextJob implements InjectableType {
private static final String TAG = RefreshAttributesJob.class.getSimpleName(); private static final String TAG = RefreshAttributesJob.class.getSimpleName();
@Inject transient SignalServiceAccountManager signalAccountManager; @Inject transient SignalServiceAccountManager signalAccountManager;
// @Inject transient RedPhoneAccountManager redPhoneAccountManager;
public RefreshAttributesJob(Context context) { public RefreshAttributesJob(Context context) {
super(context, JobParameters.newBuilder() super(context, JobParameters.newBuilder()
@ -38,14 +37,10 @@ public class RefreshAttributesJob extends ContextJob implements InjectableType {
@Override @Override
public void onRun() throws IOException { public void onRun() throws IOException {
String signalingKey = TextSecurePreferences.getSignalingKey(context); String signalingKey = TextSecurePreferences.getSignalingKey(context);
// String gcmRegistrationId = TextSecurePreferences.getGcmRegistrationId(context);
int registrationId = TextSecurePreferences.getLocalRegistrationId(context); int registrationId = TextSecurePreferences.getLocalRegistrationId(context);
boolean video = TextSecurePreferences.isWebrtcCallingEnabled(context); boolean video = TextSecurePreferences.isWebrtcCallingEnabled(context);
boolean fetchesMessages = TextSecurePreferences.isGcmDisabled(context); boolean fetchesMessages = TextSecurePreferences.isGcmDisabled(context);
// String token = signalAccountManager.getAccountVerificationToken();
// redPhoneAccountManager.createAccount(token, new RedPhoneAccountAttributes(signalingKey, gcmRegistrationId));
signalAccountManager.setAccountAttributes(signalingKey, registrationId, true, video || fetchesMessages, fetchesMessages); signalAccountManager.setAccountAttributes(signalingKey, registrationId, true, video || fetchesMessages, fetchesMessages);
} }