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

More MasterSecret cleanup

Browse Source
This commit is contained in:
Moxie Marlinspike
2018-02-01 19:22:48 -08:00
parent 59092e2ec0
commit 3633d805c8
52 changed files with 228 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,6 @@ import android.widget.Button;
import android.widget.Toast;
import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
import org.thoughtcrime.securesms.permissions.Permissions;
import org.thoughtcrime.securesms.push.AccountManagerFactory;
@@ -60,7 +59,7 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
}
@Override
public void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
public void onCreate(Bundle bundle, boolean ready) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setTitle(R.string.AndroidManifest__linked_devices);
this.deviceAddFragment = new DeviceAddFragment();
@@ -71,9 +70,9 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
this.deviceAddFragment.setScanListener(this);
if (getIntent().getBooleanExtra("add", false)) {
initFragment(android.R.id.content, deviceAddFragment, masterSecret, dynamicLanguage.getCurrentLocale());
initFragment(android.R.id.content, deviceAddFragment, dynamicLanguage.getCurrentLocale());
} else {
initFragment(android.R.id.content, deviceListFragment, masterSecret, dynamicLanguage.getCurrentLocale());
initFragment(android.R.id.content, deviceListFragment, dynamicLanguage.getCurrentLocale());
}
}