diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java index 6d6a1f216..f61f96403 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/JoinMessageItemViewHolder.java @@ -1,25 +1,15 @@ package org.briarproject.briar.android.privategroup.conversation; import android.content.Context; -import android.content.Intent; import android.support.annotation.UiThread; import android.view.View; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.R; -import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity; import org.briarproject.briar.android.threaded.BaseThreadItemViewHolder; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES; -import static org.briarproject.bramble.api.identity.Author.Status.UNKNOWN; -import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; -import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityIcon; -import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityString; -import static org.briarproject.briar.api.privategroup.Visibility.INVISIBLE; @UiThread @NotNullByDefault @@ -27,16 +17,10 @@ class JoinMessageItemViewHolder extends BaseThreadItemViewHolder { private final boolean isCreator; - private final ImageView icon; - private final TextView info; - private final Button options; JoinMessageItemViewHolder(View v, boolean isCreator) { super(v); this.isCreator = isCreator; - icon = (ImageView) v.findViewById(R.id.icon); - info = (TextView) v.findViewById(R.id.info); - options = (Button) v.findViewById(R.id.optionsButton); } @Override @@ -56,9 +40,6 @@ class JoinMessageItemViewHolder getContext().getString(R.string.groups_member_joined, item.getAuthor().getName())); } - icon.setVisibility(View.GONE); - info.setVisibility(View.GONE); - options.setVisibility(View.GONE); } private void bind(final JoinMessageItem item) { @@ -75,32 +56,6 @@ class JoinMessageItemViewHolder item.getAuthor().getName())); } } - - if (item.getStatus() == OURSELVES || item.getStatus() == UNKNOWN) { - icon.setVisibility(View.GONE); - info.setVisibility(View.GONE); - options.setVisibility(View.GONE); - } else { - icon.setVisibility(View.VISIBLE); - icon.setImageResource(getVisibilityIcon(item.getVisibility())); - info.setVisibility(View.VISIBLE); - info.setText(getVisibilityString(getContext(), item.getVisibility(), - item.getAuthor().getName())); - if (item.getVisibility() == INVISIBLE) { - options.setVisibility(View.VISIBLE); - options.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent i = - new Intent(ctx, RevealContactsActivity.class); - i.putExtra(GROUP_ID, item.getGroupId().getBytes()); - ctx.startActivity(i); - } - }); - } else { - options.setVisibility(View.GONE); - } - } } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java index 0d8910245..ceab47514 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListAdapter.java @@ -36,7 +36,6 @@ class MemberListAdapter extends @Override public boolean areContentsTheSame(MemberListItem m1, MemberListItem m2) { if (m1.isOnline() != m2.isOnline()) return false; - if (m1.getVisibility() != m2.getVisibility()) return false; if (m1.getContactId() != m2.getContactId()) return false; if (m1.getStatus() != m2.getStatus()) return false; return true; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java index e916080bf..bdef6a588 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItem.java @@ -5,7 +5,6 @@ import org.briarproject.bramble.api.identity.Author; import org.briarproject.bramble.api.identity.Author.Status; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.briar.api.privategroup.GroupMember; -import org.briarproject.briar.api.privategroup.Visibility; import javax.annotation.Nullable; import javax.annotation.concurrent.NotThreadSafe; @@ -39,10 +38,6 @@ class MemberListItem { return groupMember.getContactId(); } - Visibility getVisibility() { - return groupMember.getVisibility(); - } - boolean isOnline() { return online; } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java index 725898edc..4a242bcec 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/memberlist/MemberListItemHolder.java @@ -11,9 +11,6 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.view.AuthorView; import static org.briarproject.bramble.api.identity.Author.Status.OURSELVES; -import static org.briarproject.bramble.api.identity.Author.Status.UNKNOWN; -import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityIcon; -import static org.briarproject.briar.android.privategroup.VisibilityHelper.getVisibilityString; @UiThread @NotNullByDefault @@ -22,16 +19,12 @@ class MemberListItemHolder extends RecyclerView.ViewHolder { private final AuthorView author; private final ImageView bulb; private final TextView creator; - private final ImageView icon; - private final TextView info; MemberListItemHolder(View v) { super(v); author = (AuthorView) v.findViewById(R.id.authorView); bulb = (ImageView) v.findViewById(R.id.bulbView); creator = (TextView) v.findViewById(R.id.creatorView); - icon = (ImageView) v.findViewById(R.id.icon); - info = (TextView) v.findViewById(R.id.info); } protected void bind(MemberListItem item) { @@ -64,19 +57,6 @@ class MemberListItemHolder extends RecyclerView.ViewHolder { } else { creator.setVisibility(View.GONE); } - - // visibility information - if (item.getStatus() == OURSELVES || item.getStatus() == UNKNOWN) { - icon.setVisibility(View.GONE); - info.setVisibility(View.GONE); - } else { - icon.setVisibility(View.VISIBLE); - icon.setImageResource(getVisibilityIcon(item.getVisibility())); - info.setVisibility(View.VISIBLE); - info.setText( - getVisibilityString(info.getContext(), item.getVisibility(), - item.getMember().getName())); - } } } diff --git a/briar-android/src/main/res/layout/list_item_group_join_notice.xml b/briar-android/src/main/res/layout/list_item_group_join_notice.xml index 02e0b4b4b..ee57435fb 100644 --- a/briar-android/src/main/res/layout/list_item_group_join_notice.xml +++ b/briar-android/src/main/res/layout/list_item_group_join_notice.xml @@ -19,57 +19,15 @@ android:textStyle="italic" tools:text="@string/groups_member_joined"/> - - - - -