From 1c9715f700b0a34896548494c9b585acf2719dc5 Mon Sep 17 00:00:00 2001 From: Paride Legovini Date: Wed, 15 Mar 2017 15:04:10 +0100 Subject: [PATCH] More RedPhone cleanup Closes #6393 // FREEBIE --- build.gradle | 3 --- .../thoughtcrime/securesms/jobs/RefreshAttributesJob.java | 5 ----- 2 files changed, 8 deletions(-) diff --git a/build.gradle b/build.gradle index 1ff7cb845..abfa9a161 100644 --- a/build.gradle +++ b/build.gradle @@ -212,9 +212,6 @@ android { buildConfigField "String", "GIPHY_PROXY_HOST", "\"giphy-proxy-production.whispersystems.org\"" buildConfigField "int", "GIPHY_PROXY_PORT", "80" 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" } diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java index 7bf25e9d7..0c5d05bb8 100644 --- a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java @@ -21,7 +21,6 @@ public class RefreshAttributesJob extends ContextJob implements InjectableType { private static final String TAG = RefreshAttributesJob.class.getSimpleName(); @Inject transient SignalServiceAccountManager signalAccountManager; -// @Inject transient RedPhoneAccountManager redPhoneAccountManager; public RefreshAttributesJob(Context context) { super(context, JobParameters.newBuilder() @@ -38,14 +37,10 @@ public class RefreshAttributesJob extends ContextJob implements InjectableType { @Override public void onRun() throws IOException { String signalingKey = TextSecurePreferences.getSignalingKey(context); -// String gcmRegistrationId = TextSecurePreferences.getGcmRegistrationId(context); int registrationId = TextSecurePreferences.getLocalRegistrationId(context); boolean video = TextSecurePreferences.isWebrtcCallingEnabled(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); }