From 41aa53dd664a248e0a7b60cf6388cad495ff3d76 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Thu, 13 Feb 2014 12:36:31 -0800
Subject: [PATCH] masterSecret

---
 .../thoughtcrime/securesms/ConversationListActivity.java | 1 +
 src/org/thoughtcrime/securesms/GroupCreateActivity.java  | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index d0f033537..20306f926 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -156,6 +156,7 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
 
   private void createGroup() {
     Intent intent = new Intent(this, GroupCreateActivity.class);
+    intent.putExtra("master_secret", masterSecret);
     startActivity(intent);
   }
 
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index d45e2f3b8..5a0e3b546 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -31,6 +31,7 @@ import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter;
 import org.thoughtcrime.securesms.util.Util;
+import org.whispersystems.textsecure.crypto.MasterSecret;
 import org.whispersystems.textsecure.directory.Directory;
 import org.whispersystems.textsecure.directory.NotInDirectoryException;
 import org.whispersystems.textsecure.util.InvalidNumberException;
@@ -49,6 +50,8 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
 
   private final static String TAG = "GroupCreateActivity";
 
+  public static final String MASTER_SECRET_EXTRA = "master_secret";
+
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
@@ -60,7 +63,8 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
   private PushRecipientsPanel recipientsPanel;
   private ImageView           avatar;
 
-  private Bitmap avatarBmp;
+  private MasterSecret masterSecret;
+  private Bitmap       avatarBmp;
 
   private Set<Recipient> selectedContacts;
 
@@ -114,7 +118,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
       }
     } catch (NotInDirectoryException e) {
       return false;
-    } catch (InvalidNumberException e ) {
+    } catch (InvalidNumberException e) {
       return false;
     }
     return true;
@@ -144,6 +148,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
   }
 
   private void initializeResources() {
+    masterSecret = getIntent().getParcelableExtra(MASTER_SECRET_EXTRA);
     groupName = (EditText) findViewById(R.id.group_name);
     groupName.addTextChangedListener(new TextWatcher() {
       @Override