TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-30 01:36:57 +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

6
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@@ -97,7 +97,6 @@ import org.thoughtcrime.securesms.components.reminder.UnauthorizedReminder;
import org.thoughtcrime.securesms.contacts.ContactAccessor;
import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.SecurityEvent;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -259,7 +258,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
@Override
protected void onCreate(Bundle state, @NonNull MasterSecret masterSecret) {
protected void onCreate(Bundle state, boolean ready) {
Log.w(TAG, "onCreate()");
supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY);
@@ -271,8 +270,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
getWindow().getDecorView().setBackgroundColor(color);
fragment = initFragment(R.id.fragment_content, new ConversationFragment(),
masterSecret, dynamicLanguage.getCurrentLocale());
fragment = initFragment(R.id.fragment_content, new ConversationFragment(), dynamicLanguage.getCurrentLocale());
initializeReceivers();
initializeActionBar();