1) move PUSH_URL from Release.java into BuildConfig.java

2) use textsecure-service-staging.whispersystems.org for test build

// FREEBIE

hack
This commit is contained in:
Rhodey Orbits
2015-05-14 18:14:42 -07:00
committed by Moxie Marlinspike
parent ce77cb81df
commit e3760630bf
5 changed files with 11 additions and 16 deletions

View File

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.dependencies;
import android.content.Context;
import org.thoughtcrime.securesms.Release;
import org.thoughtcrime.securesms.BuildConfig;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.storage.TextSecureAxolotlStore;
import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob;
@@ -47,7 +47,7 @@ public class TextSecureCommunicationModule {
}
@Provides TextSecureAccountManager provideTextSecureAccountManager() {
return new TextSecureAccountManager(Release.PUSH_URL,
return new TextSecureAccountManager(BuildConfig.PUSH_URL,
new TextSecurePushTrustStore(context),
TextSecurePreferences.getLocalNumber(context),
TextSecurePreferences.getPushServerPassword(context));
@@ -57,7 +57,7 @@ public class TextSecureCommunicationModule {
return new TextSecureMessageSenderFactory() {
@Override
public TextSecureMessageSender create(MasterSecret masterSecret) {
return new TextSecureMessageSender(Release.PUSH_URL,
return new TextSecureMessageSender(BuildConfig.PUSH_URL,
new TextSecurePushTrustStore(context),
TextSecurePreferences.getLocalNumber(context),
TextSecurePreferences.getPushServerPassword(context),
@@ -69,7 +69,7 @@ public class TextSecureCommunicationModule {
}
@Provides TextSecureMessageReceiver provideTextSecureMessageReceiver() {
return new TextSecureMessageReceiver(Release.PUSH_URL,
return new TextSecureMessageReceiver(BuildConfig.PUSH_URL,
new TextSecurePushTrustStore(context),
new DynamicCredentialsProvider(context));
}