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

Support for censorship circumvention in Egypt and UAE

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2016-12-20 09:55:52 -08:00
parent 777aeea138
commit 541718fd11
28 changed files with 220 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/DeviceActivity.java
View File

@@ -16,7 +16,7 @@ import android.widget.Toast;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
import org.thoughtcrime.securesms.push.AccountManagerFactory;
import org.thoughtcrime.securesms.qr.ScanListener;
import org.thoughtcrime.securesms.util.Base64;
import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -146,7 +146,7 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
protected Integer doInBackground(Void... params) {
try {
Context context = DeviceActivity.this;
SignalServiceAccountManager accountManager = TextSecureCommunicationFactory.createManager(context);
SignalServiceAccountManager accountManager = AccountManagerFactory.createManager(context);
String verificationCode = accountManager.getNewDeviceVerificationCode();
String ephemeralId = uri.getQueryParameter("uuid");
String publicKeyEncoded = uri.getQueryParameter("pub_key");