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

TextSecure is now SignalService

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2016-03-23 10:34:41 -07:00
parent 3b8ec792ee
commit 7b589c4300
126 changed files with 681 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
View File

@@ -33,9 +33,9 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
import org.whispersystems.textsecure.api.push.exceptions.AuthorizationFailedException;
import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.SignalServiceAccountManager;
import org.whispersystems.signalservice.api.push.exceptions.AuthorizationFailedException;
import java.io.IOException;
@@ -187,12 +187,12 @@ public class AdvancedPreferenceFragment extends PreferenceFragment {
@Override
protected Integer doInBackground(Void... params) {
try {
Context context = getActivity();
TextSecureAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
RedPhoneAccountManager redPhoneAccountManager = new RedPhoneAccountManager(BuildConfig.REDPHONE_MASTER_URL,
new RedPhoneTrustStore(context),
TextSecurePreferences.getLocalNumber(context),
TextSecurePreferences.getPushServerPassword(context));
Context context = getActivity();
SignalServiceAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
RedPhoneAccountManager redPhoneAccountManager = new RedPhoneAccountManager(BuildConfig.REDPHONE_MASTER_URL,
new RedPhoneTrustStore(context),
TextSecurePreferences.getLocalNumber(context),
TextSecurePreferences.getPushServerPassword(context));
try {
accountManager.setGcmId(Optional.<String>absent());