Skip to content
Snippets Groups Projects
Commit cd147d78 authored by akwizgran's avatar akwizgran
Browse files

Pass the group's salt through to the DB when subscribing.

parent e73dc148
No related branches found
No related tags found
No related merge requests found
......@@ -76,7 +76,9 @@ SelectContactsDialog.Listener {
String name = i.getStringExtra("net.sf.briar.GROUP_NAME");
if(name == null) throw new IllegalStateException();
setTitle(name);
group = new Group(id, name, null);
b = i.getByteArrayExtra("net.sf.briar.GROUP_SALT");
if(b == null) throw new IllegalStateException();
group = new Group(id, name, b);
subscribed = i.getBooleanExtra("net.sf.briar.SUBSCRIBED", false);
boolean all = i.getBooleanExtra("net.sf.briar.VISIBLE_TO_ALL", false);
......
......@@ -135,6 +135,7 @@ implements DatabaseListener, OnItemClickListener {
Intent i = new Intent(this, ConfigureGroupActivity.class);
i.putExtra("net.sf.briar.GROUP_ID", g.getId().getBytes());
i.putExtra("net.sf.briar.GROUP_NAME", g.getName());
i.putExtra("net.sf.briar.GROUP_SALT", g.getSalt());
i.putExtra("net.sf.briar.SUBSCRIBED", s.isSubscribed());
i.putExtra("net.sf.briar.VISIBLE_TO_ALL", s.isVisibleToAll());
startActivity(i);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment