diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml index ca4a2e6795e3125995f741bf6f50ac544fd2814e..99ad3cfada95848bac44c53f9f195fdc71032623 100644 --- a/briar-android/AndroidManifest.xml +++ b/briar-android/AndroidManifest.xml @@ -133,7 +133,7 @@ <activity android:name=".android.privategroup.memberlist.GroupMemberListActivity" - android:label="@string/app_name" + android:label="@string/groups_member_list" android:parentActivityName=".android.privategroup.conversation.GroupActivity" android:windowSoftInputMode="adjustResize|stateHidden"> <meta-data diff --git a/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java b/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java index 2a62ebe8016cd01648f95cf3b80040576b54a52e..a6a8066047e6696cc355b62682b05a447751593a 100644 --- a/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java +++ b/briar-android/src/org/briarproject/android/privategroup/conversation/GroupActivity.java @@ -140,7 +140,6 @@ public class GroupActivity extends case R.id.action_group_member_list: Intent i = new Intent(this, GroupMemberListActivity.class); i.putExtra(GROUP_ID, groupId.getBytes()); - i.putExtra(GROUP_NAME, getTitle()); ActivityOptionsCompat options = makeCustomAnimation(this, android.R.anim.slide_in_left, android.R.anim.slide_out_right); diff --git a/briar-android/src/org/briarproject/android/privategroup/memberlist/GroupMemberListActivity.java b/briar-android/src/org/briarproject/android/privategroup/memberlist/GroupMemberListActivity.java index 56145d7884bfc0ad8d3d1abaadf22db0df1d75b7..a3523f85596c8d90bfd44af4f4bbf3d425dbb3f6 100644 --- a/briar-android/src/org/briarproject/android/privategroup/memberlist/GroupMemberListActivity.java +++ b/briar-android/src/org/briarproject/android/privategroup/memberlist/GroupMemberListActivity.java @@ -41,9 +41,6 @@ public class GroupMemberListActivity extends BriarActivity { byte[] b = i.getByteArrayExtra(GROUP_ID); if (b == null) throw new IllegalStateException("No GroupId in intent."); 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); LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this); diff --git a/briar-android/src/org/briarproject/android/privategroup/memberlist/MemberListItem.java b/briar-android/src/org/briarproject/android/privategroup/memberlist/MemberListItem.java index 7b5a7cdb522dd22cb102cc6463e1daa0658c8f40..ef0c73d91f2e1a5cacccea458d6f1bbe0a44c92f 100644 --- a/briar-android/src/org/briarproject/android/privategroup/memberlist/MemberListItem.java +++ b/briar-android/src/org/briarproject/android/privategroup/memberlist/MemberListItem.java @@ -5,15 +5,15 @@ import org.briarproject.api.identity.Author.Status; import org.briarproject.api.nullsafety.NotNullByDefault; import org.briarproject.api.privategroup.GroupMember; -import javax.annotation.concurrent.NotThreadSafe; +import javax.annotation.concurrent.Immutable; -@NotThreadSafe +@Immutable @NotNullByDefault -public class MemberListItem { +class MemberListItem { private final Author member; - private Status status; - private boolean sharing; + private final Status status; + private final boolean sharing; public MemberListItem(GroupMember groupMember) { this.member = groupMember.getAuthor();