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

Address review comments for group member list

Browse Source
This commit is contained in:
Torsten Grote
2016-11-01 07:34:54 -02:00
parent 8fdce5ba51
commit 3da879cfd9
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/AndroidManifest.xml
View File

@@ -133,7 +133,7 @@
<activity <activity
android:name=".android.privategroup.memberlist.GroupMemberListActivity" android:name=".android.privategroup.memberlist.GroupMemberListActivity"
android:label="@string/app_name" android:label="@string/groups_member_list"
android:parentActivityName=".android.privategroup.conversation.GroupActivity" android:parentActivityName=".android.privategroup.conversation.GroupActivity"
android:windowSoftInputMode="adjustResize|stateHidden"> android:windowSoftInputMode="adjustResize|stateHidden">
<meta-data <meta-data

1
briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java
View File

@@ -140,7 +140,6 @@ public class GroupActivity extends
case R.id.action_group_member_list: case R.id.action_group_member_list:
Intent i = new Intent(this, GroupMemberListActivity.class); Intent i = new Intent(this, GroupMemberListActivity.class);
i.putExtra(GROUP_ID, groupId.getBytes()); i.putExtra(GROUP_ID, groupId.getBytes());
i.putExtra(GROUP_NAME, getTitle());
ActivityOptionsCompat options = ActivityOptionsCompat options =
makeCustomAnimation(this, android.R.anim.slide_in_left, makeCustomAnimation(this, android.R.anim.slide_in_left,
android.R.anim.slide_out_right); android.R.anim.slide_out_right);

3
briar-android/src/org/briarproject/android/privategroup/memberlist/GroupMemberListActivity.java
View File

@@ -41,9 +41,6 @@ public class GroupMemberListActivity extends BriarActivity {
byte[] b = i.getByteArrayExtra(GROUP_ID); byte[] b = i.getByteArrayExtra(GROUP_ID);
if (b == null) throw new IllegalStateException("No GroupId in intent."); if (b == null) throw new IllegalStateException("No GroupId in intent.");
groupId = new GroupId(b); groupId = new GroupId(b);
String name = i.getStringExtra(GROUP_NAME);
if (name == null) throw new IllegalStateException("No name in intent.");
setTitle(name + " " + getString(R.string.groups_member_list));
list = (BriarRecyclerView) findViewById(R.id.list); list = (BriarRecyclerView) findViewById(R.id.list);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);

10
briar-android/src/org/briarproject/android/privategroup/memberlist/MemberListItem.java
View File

@@ -5,15 +5,15 @@ import org.briarproject.api.identity.Author.Status;
import org.briarproject.api.nullsafety.NotNullByDefault; import org.briarproject.api.nullsafety.NotNullByDefault;
import org.briarproject.api.privategroup.GroupMember; import org.briarproject.api.privategroup.GroupMember;
import javax.annotation.concurrent.NotThreadSafe; import javax.annotation.concurrent.Immutable;
@NotThreadSafe @Immutable
@NotNullByDefault @NotNullByDefault
public class MemberListItem { class MemberListItem {
private final Author member; private final Author member;
private Status status; private final Status status;
private boolean sharing; private final boolean sharing;
public MemberListItem(GroupMember groupMember) { public MemberListItem(GroupMember groupMember) {
this.member = groupMember.getAuthor(); this.member = groupMember.getAuthor();