TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

masterSecret

Browse Source
This commit is contained in:
Jake McGinty 2014-02-13 12:36:31 -08:00
parent b47076cf1b
commit 41aa53dd66
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/thoughtcrime/securesms/ConversationListActivity.java
View File

@ -156,6 +156,7 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
private void createGroup() { private void createGroup() {
Intent intent = new Intent(this, GroupCreateActivity.class); Intent intent = new Intent(this, GroupCreateActivity.class);
intent.putExtra("master_secret", masterSecret);
startActivity(intent); startActivity(intent);
} }

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

@ -31,6 +31,7 @@ import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter; import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.crypto.MasterSecret;
import org.whispersystems.textsecure.directory.Directory; import org.whispersystems.textsecure.directory.Directory;
import org.whispersystems.textsecure.directory.NotInDirectoryException; import org.whispersystems.textsecure.directory.NotInDirectoryException;
import org.whispersystems.textsecure.util.InvalidNumberException; import org.whispersystems.textsecure.util.InvalidNumberException;
@ -49,6 +50,8 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
private final static String TAG = "GroupCreateActivity"; private final static String TAG = "GroupCreateActivity";
public static final String MASTER_SECRET_EXTRA = "master_secret";
private final DynamicTheme dynamicTheme = new DynamicTheme(); private final DynamicTheme dynamicTheme = new DynamicTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
@ -60,6 +63,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
private PushRecipientsPanel recipientsPanel; private PushRecipientsPanel recipientsPanel;
private ImageView avatar; private ImageView avatar;
private MasterSecret masterSecret;
private Bitmap avatarBmp; private Bitmap avatarBmp;
private Set<Recipient> selectedContacts; private Set<Recipient> selectedContacts;
@ -114,7 +118,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
} }
} catch (NotInDirectoryException e) { } catch (NotInDirectoryException e) {
return false; return false;
} catch (InvalidNumberException e ) { } catch (InvalidNumberException e) {
return false; return false;
} }
return true; return true;
@ -144,6 +148,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
} }
private void initializeResources() { private void initializeResources() {
masterSecret = getIntent().getParcelableExtra(MASTER_SECRET_EXTRA);
groupName = (EditText) findViewById(R.id.group_name); groupName = (EditText) findViewById(R.id.group_name);
groupName.addTextChangedListener(new TextWatcher() { groupName.addTextChangedListener(new TextWatcher() {
@Override @Override