Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-11 18:29:05 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
akwizgran
2013-11-19 23:13:54 +00:00
parent e73dc148c3
commit cd147d7861
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/net/sf/briar/android/groups/ConfigureGroupActivity.java
View File

@@ -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);

1
briar-android/src/net/sf/briar/android/groups/ManageGroupsActivity.java
View File

@@ -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);