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

[android] refactor conversation items and view holders

Browse Source 
This is a preparation for image support.
This commit is contained in:
Torsten Grote
2018-11-07 14:48:39 -03:00
parent 50cc0a6815
commit ad4729b2f9
29 changed files with 289 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -388,8 +388,8 @@ public class ConversationActivity extends BriarActivity
private void displayMessageText(MessageId m, String text) { private void displayMessageText(MessageId m, String text) {
runOnUiThreadUnlessDestroyed(() -> { runOnUiThreadUnlessDestroyed(() -> {
textCache.put(m, text); textCache.put(m, text);
SparseArray<ConversationItem> messages = SparseArray<ConversationMessageItem> messages =
adapter.getPrivateMessages(); adapter.getMessageItems();
for (int i = 0; i < messages.size(); i++) { for (int i = 0; i < messages.size(); i++) {
ConversationItem item = messages.valueAt(i); ConversationItem item = messages.valueAt(i);
if (item.getId().equals(m)) { if (item.getId().equals(m)) {
@@ -472,10 +472,9 @@ public class ConversationActivity extends BriarActivity
runOnUiThreadUnlessDestroyed(() -> { runOnUiThreadUnlessDestroyed(() -> {
adapter.incrementRevision(); adapter.incrementRevision();
Set<MessageId> messages = new HashSet<>(messageIds); Set<MessageId> messages = new HashSet<>(messageIds);
SparseArray<ConversationOutItem> list = SparseArray<ConversationItem> list = adapter.getOutgoingMessages();
adapter.getOutgoingMessages();
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
ConversationOutItem item = list.valueAt(i); ConversationItem item = list.valueAt(i);
if (messages.contains(item.getId())) { if (messages.contains(item.getId())) {
item.setSent(sent); item.setSent(sent);
item.setSeen(seen); item.setSeen(seen);

50
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationAdapter.java
View File

@@ -14,6 +14,7 @@ import org.briarproject.briar.android.util.BriarAdapter;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@NotNullByDefault
class ConversationAdapter class ConversationAdapter
extends BriarAdapter<ConversationItem, ConversationItemViewHolder> { extends BriarAdapter<ConversationItem, ConversationItemViewHolder> {
@@ -38,15 +39,15 @@ class ConversationAdapter
type, viewGroup, false); type, viewGroup, false);
switch (type) { switch (type) {
case R.layout.list_item_conversation_msg_in: case R.layout.list_item_conversation_msg_in:
return new ConversationItemViewHolder(v); return new ConversationMessageViewHolder(v, true);
case R.layout.list_item_conversation_msg_out: case R.layout.list_item_conversation_msg_out:
return new ConversationMessageOutViewHolder(v); return new ConversationMessageViewHolder(v, false);
case R.layout.list_item_conversation_notice_in: case R.layout.list_item_conversation_notice_in:
return new ConversationNoticeInViewHolder(v); return new ConversationNoticeViewHolder(v, true);
case R.layout.list_item_conversation_notice_out: case R.layout.list_item_conversation_notice_out:
return new ConversationNoticeOutViewHolder(v); return new ConversationNoticeViewHolder(v, false);
case R.layout.list_item_conversation_request: case R.layout.list_item_conversation_request:
return new ConversationRequestViewHolder(v); return new ConversationRequestViewHolder(v, true);
default: default:
throw new IllegalArgumentException("Unknown ConversationItem"); throw new IllegalArgumentException("Unknown ConversationItem");
} }
@@ -56,21 +57,18 @@ class ConversationAdapter
public void onBindViewHolder(ConversationItemViewHolder ui, int position) { public void onBindViewHolder(ConversationItemViewHolder ui, int position) {
ConversationItem item = items.get(position); ConversationItem item = items.get(position);
if (item instanceof ConversationRequestItem) { if (item instanceof ConversationRequestItem) {
((ConversationRequestViewHolder) ui).bind(item, listener); ((ConversationRequestViewHolder) ui)
.bind((ConversationRequestItem) item, listener);
} else { } else {
//noinspection unchecked
ui.bind(item); ui.bind(item);
} }
listener.onItemVisible(item); listener.onItemVisible(item);
} }
@Override @Override
public int compare(ConversationItem c1, public int compare(ConversationItem c1, ConversationItem c2) {
ConversationItem c2) { return Long.compare(c1.getTime(), c2.getTime());
long time1 = c1.getTime();
long time2 = c2.getTime();
if (time1 < time2) return -1;
if (time1 > time2) return 1;
return 0;
} }
@Override @Override
@@ -94,39 +92,25 @@ class ConversationAdapter
} }
} }
SparseArray<ConversationItem> getIncomingMessages() { SparseArray<ConversationItem> getOutgoingMessages() {
SparseArray<ConversationItem> messages = new SparseArray<>(); SparseArray<ConversationItem> messages = new SparseArray<>();
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
ConversationItem item = items.get(i); ConversationItem item = items.get(i);
if (item.isIncoming()) { if (!item.isIncoming()) {
messages.put(i, item); messages.put(i, item);
} }
} }
return messages; return messages;
} }
SparseArray<ConversationOutItem> getOutgoingMessages() { SparseArray<ConversationMessageItem> getMessageItems() {
SparseArray<ConversationOutItem> messages = new SparseArray<>(); SparseArray<ConversationMessageItem> messages = new SparseArray<>();
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
ConversationItem item = items.get(i); ConversationItem item = items.get(i);
if (item instanceof ConversationOutItem) { if (item instanceof ConversationMessageItem) {
messages.put(i, (ConversationOutItem) item); messages.put(i, (ConversationMessageItem) item);
}
}
return messages;
}
SparseArray<ConversationItem> getPrivateMessages() {
SparseArray<ConversationItem> messages = new SparseArray<>();
for (int i = 0; i < items.size(); i++) {
ConversationItem item = items.get(i);
if (item instanceof ConversationMessageInItem) {
messages.put(i, item);
} else if (item instanceof ConversationMessageOutItem) {
messages.put(i, item);
} }
} }
return messages; return messages;

65
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItem.java
View File

@@ -5,6 +5,7 @@ import android.support.annotation.LayoutRes;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.api.conversation.ConversationMessageHeader;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe; import javax.annotation.concurrent.NotThreadSafe;
@@ -13,20 +14,31 @@ import javax.annotation.concurrent.NotThreadSafe;
@NotNullByDefault @NotNullByDefault
abstract class ConversationItem { abstract class ConversationItem {
@LayoutRes
private final int layoutRes;
@Nullable @Nullable
protected String text; protected String text;
private final MessageId id; private final MessageId id;
private final GroupId groupId; private final GroupId groupId;
private final long time; private final long time;
private boolean read; private final boolean isIncoming;
private boolean read, sent, seen;
ConversationItem(MessageId id, GroupId groupId, @Nullable String text, ConversationItem(@LayoutRes int layoutRes, ConversationMessageHeader h) {
long time, boolean read) { this.layoutRes = layoutRes;
this.id = id; this.text = null;
this.groupId = groupId; this.id = h.getId();
this.text = text; this.groupId = h.getGroupId();
this.time = time; this.time = h.getTimestamp();
this.read = read; this.read = h.isRead();
this.sent = h.isSent();
this.seen = h.isSeen();
this.isIncoming = !h.isLocal();
}
@LayoutRes
public int getLayout() {
return layoutRes;
} }
MessageId getId() { MessageId getId() {
@@ -50,12 +62,43 @@ abstract class ConversationItem {
return time; return time;
} }
/**
* Only useful for incoming messages.
*/
public boolean isRead() { public boolean isRead() {
return read; return read;
} }
abstract public boolean isIncoming(); /**
* Only useful for outgoing messages.
*/
boolean isSent() {
return sent;
}
/**
* Only useful for outgoing messages.
*/
void setSent(boolean sent) {
this.sent = sent;
}
/**
* Only useful for outgoing messages.
*/
boolean isSeen() {
return seen;
}
/**
* Only useful for outgoing messages.
*/
void setSeen(boolean seen) {
this.seen = seen;
}
public boolean isIncoming() {
return isIncoming;
}
@LayoutRes
abstract public int getLayout();
} }

26
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationItemViewHolder.java
View File

@@ -1,6 +1,7 @@
package org.briarproject.briar.android.conversation; package org.briarproject.briar.android.conversation;
import android.support.annotation.CallSuper; import android.support.annotation.CallSuper;
import android.support.annotation.Nullable;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.support.v7.widget.RecyclerView.ViewHolder; import android.support.v7.widget.RecyclerView.ViewHolder;
import android.view.View; import android.view.View;
@@ -8,35 +9,46 @@ import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.util.StringUtils;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.util.UiUtils;
import static org.briarproject.bramble.util.StringUtils.trim;
import static org.briarproject.briar.android.util.UiUtils.formatDate;
@UiThread @UiThread
@NotNullByDefault @NotNullByDefault
class ConversationItemViewHolder extends ViewHolder { abstract class ConversationItemViewHolder<T extends ConversationItem>
extends ViewHolder {
protected final ViewGroup layout; protected final ViewGroup layout;
@Nullable
private final OutItemViewHolder outViewHolder;
private final TextView text; private final TextView text;
private final TextView time; private final TextView time;
ConversationItemViewHolder(View v) { ConversationItemViewHolder(View v, boolean isIncoming) {
super(v); super(v);
this.outViewHolder = isIncoming ? null : new OutItemViewHolder(v);
layout = v.findViewById(R.id.layout); layout = v.findViewById(R.id.layout);
text = v.findViewById(R.id.text); text = v.findViewById(R.id.text);
time = v.findViewById(R.id.time); time = v.findViewById(R.id.time);
} }
@CallSuper @CallSuper
void bind(ConversationItem item) { void bind(T item) {
if (item.getText() == null) { if (item.getText() == null) {
text.setText("\u2026"); text.setText("\u2026");
} else { } else {
text.setText(StringUtils.trim(item.getText())); text.setText(trim(item.getText()));
} }
long timestamp = item.getTime(); long timestamp = item.getTime();
time.setText(UiUtils.formatDate(time.getContext(), timestamp)); time.setText(formatDate(time.getContext(), timestamp));
if (outViewHolder != null) outViewHolder.bind(item);
}
protected boolean isIncoming() {
return outViewHolder == null;
} }
} }

30
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageInItem.java
View File

@@ -1,30 +0,0 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
import org.briarproject.briar.api.messaging.PrivateMessageHeader;
import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
@NotNullByDefault
class ConversationMessageInItem extends ConversationItem {
ConversationMessageInItem(PrivateMessageHeader h) {
super(h.getId(), h.getGroupId(), null, h.getTimestamp(), h.isRead());
}
@Override
public boolean isIncoming() {
return true;
}
@LayoutRes
@Override
public int getLayout() {
return R.layout.list_item_conversation_msg_in;
}
}

28
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageItem.java Normal file
View File

@@ -0,0 +1,28 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.messaging.AttachmentHeader;
import org.briarproject.briar.api.messaging.PrivateMessageHeader;
import java.util.List;
import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
@NotNullByDefault
class ConversationMessageItem extends ConversationItem {
private final List<AttachmentHeader> attachments;
ConversationMessageItem(@LayoutRes int layoutRes, PrivateMessageHeader h) {
super(layoutRes, h);
this.attachments = h.getAttachmentHeaders();
}
List<AttachmentHeader> getAttachments() {
return attachments;
}
}

26
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutItem.java
View File

@@ -1,26 +0,0 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
import org.briarproject.briar.api.messaging.PrivateMessageHeader;
import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
@NotNullByDefault
class ConversationMessageOutItem extends ConversationOutItem {
ConversationMessageOutItem(PrivateMessageHeader h) {
super(h.getId(), h.getGroupId(), null, h.getTimestamp(), h.isSent(),
h.isSeen());
}
@LayoutRes
@Override
public int getLayout() {
return R.layout.list_item_conversation_msg_out;
}
}

16
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageOutViewHolder.java
View File

@@ -1,16 +0,0 @@
package org.briarproject.briar.android.conversation;
import android.view.View;
class ConversationMessageOutViewHolder extends ConversationOutItemViewHolder {
ConversationMessageOutViewHolder(View v) {
super(v);
}
@Override
protected boolean hasDarkBackground() {
return true;
}
}

24
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationMessageViewHolder.java Normal file
View File

@@ -0,0 +1,24 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread;
import android.view.View;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
@UiThread
@NotNullByDefault
class ConversationMessageViewHolder
extends ConversationItemViewHolder<ConversationMessageItem> {
// image support will be added here (#1242)
ConversationMessageViewHolder(View v, boolean isIncoming) {
super(v, isIncoming);
}
@Override
void bind(ConversationMessageItem item) {
super.bind(item);
}
}

47
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInItem.java
View File

@@ -1,47 +0,0 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.R;
import org.briarproject.briar.api.conversation.ConversationResponse;
import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
@NotNullByDefault
class ConversationNoticeInItem extends ConversationItem {
@Nullable
private final String msgText;
ConversationNoticeInItem(MessageId id, GroupId groupId, String text,
@Nullable String msgText, long time, boolean read) {
super(id, groupId, text, time, read);
this.msgText = msgText;
}
ConversationNoticeInItem(String text, ConversationResponse r) {
super(r.getId(), r.getGroupId(), text, r.getTimestamp(), r.isRead());
this.msgText = null;
}
@Nullable
String getMsgText() {
return msgText;
}
@Override
public boolean isIncoming() {
return true;
}
@LayoutRes
@Override
public int getLayout() {
return R.layout.list_item_conversation_notice_in;
}
}

43
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeInViewHolder.java
View File

@@ -1,43 +0,0 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread;
import android.view.View;
import android.widget.TextView;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.util.StringUtils;
import org.briarproject.briar.R;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
@UiThread
@NotNullByDefault
class ConversationNoticeInViewHolder extends ConversationItemViewHolder {
private final TextView msgText;
ConversationNoticeInViewHolder(View v) {
super(v);
msgText = v.findViewById(R.id.msgText);
}
@Override
void bind(ConversationItem conversationItem) {
super.bind(conversationItem);
ConversationNoticeInItem item =
(ConversationNoticeInItem) conversationItem;
String text = item.getMsgText();
if (StringUtils.isNullOrEmpty(text)) {
msgText.setVisibility(GONE);
layout.setBackgroundResource(R.drawable.notice_in);
} else {
msgText.setVisibility(VISIBLE);
msgText.setText(StringUtils.trim(text));
layout.setBackgroundResource(R.drawable.notice_in_bottom);
}
}
}

22
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutItem.java → briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java
View File

@@ -3,7 +3,6 @@ package org.briarproject.briar.android.conversation;
import android.support.annotation.LayoutRes; import android.support.annotation.LayoutRes;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
import org.briarproject.briar.api.conversation.ConversationRequest; import org.briarproject.briar.api.conversation.ConversationRequest;
import org.briarproject.briar.api.conversation.ConversationResponse; import org.briarproject.briar.api.conversation.ConversationResponse;
@@ -12,20 +11,22 @@ import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe @NotThreadSafe
@NotNullByDefault @NotNullByDefault
class ConversationNoticeOutItem extends ConversationOutItem { class ConversationNoticeItem extends ConversationItem {
@Nullable @Nullable
private final String msgText; private final String msgText;
ConversationNoticeOutItem(String text, ConversationRequest r) { ConversationNoticeItem(@LayoutRes int layoutRes, String text,
super(r.getId(), r.getGroupId(), text, r.getTimestamp(), r.isSent(), ConversationRequest r) {
r.isSeen()); super(layoutRes, r);
this.text = text;
this.msgText = r.getText(); this.msgText = r.getText();
} }
ConversationNoticeOutItem(String text, ConversationResponse r) { ConversationNoticeItem(@LayoutRes int layoutRes, String text,
super(r.getId(), r.getGroupId(), text, r.getTimestamp(), r.isSent(), ConversationResponse r) {
r.isSeen()); super(layoutRes, r);
this.text = text;
this.msgText = null; this.msgText = null;
} }
@@ -34,9 +35,4 @@ class ConversationNoticeOutItem extends ConversationOutItem {
return msgText; return msgText;
} }
@LayoutRes
@Override
public int getLayout() {
return R.layout.list_item_conversation_notice_out;
}
} }

48
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeOutViewHolder.java
View File

@@ -1,48 +0,0 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread;
import android.view.View;
import android.widget.TextView;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.util.StringUtils;
import org.briarproject.briar.R;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
@UiThread
@NotNullByDefault
class ConversationNoticeOutViewHolder extends ConversationOutItemViewHolder {
private final TextView msgText;
ConversationNoticeOutViewHolder(View v) {
super(v);
msgText = v.findViewById(R.id.msgText);
}
@Override
void bind(ConversationItem conversationItem) {
super.bind(conversationItem);
ConversationNoticeOutItem item =
(ConversationNoticeOutItem) conversationItem;
String text = item.getMsgText();
if (StringUtils.isNullOrEmpty(text)) {
msgText.setVisibility(GONE);
layout.setBackgroundResource(R.drawable.notice_out);
} else {
msgText.setVisibility(VISIBLE);
msgText.setText(StringUtils.trim(text));
layout.setBackgroundResource(R.drawable.notice_out_bottom);
}
}
@Override
protected boolean hasDarkBackground() {
return false;
}
}

44
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeViewHolder.java Normal file
View File

@@ -0,0 +1,44 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread;
import android.view.View;
import android.widget.TextView;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
import static org.briarproject.bramble.util.StringUtils.trim;
@UiThread
@NotNullByDefault
class ConversationNoticeViewHolder<T extends ConversationNoticeItem>
extends ConversationItemViewHolder<T> {
private final TextView msgText;
ConversationNoticeViewHolder(View v, boolean isIncoming) {
super(v, isIncoming);
msgText = v.findViewById(R.id.msgText);
}
@Override
void bind(T item) {
super.bind(item);
String text = item.getMsgText();
if (isNullOrEmpty(text)) {
msgText.setVisibility(GONE);
layout.setBackgroundResource(isIncoming() ? R.drawable.notice_in :
R.drawable.notice_out);
} else {
msgText.setVisibility(VISIBLE);
msgText.setText(trim(text));
layout.setBackgroundResource(isIncoming() ?
R.drawable.notice_in_bottom : R.drawable.notice_out_bottom);
}
}
}

45
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItem.java
View File

@@ -1,45 +0,0 @@
package org.briarproject.briar.android.conversation;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.bramble.api.sync.MessageId;
import javax.annotation.Nullable;
import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe
@NotNullByDefault
abstract class ConversationOutItem extends ConversationItem {
private boolean sent, seen;
ConversationOutItem(MessageId id, GroupId groupId, @Nullable String text,
long time, boolean sent, boolean seen) {
super(id, groupId, text, time, true);
this.sent = sent;
this.seen = seen;
}
boolean isSent() {
return sent;
}
void setSent(boolean sent) {
this.sent = sent;
}
boolean isSeen() {
return seen;
}
void setSeen(boolean seen) {
this.seen = seen;
}
@Override
public boolean isIncoming() {
return false;
}
}

44
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationOutItemViewHolder.java
View File

@@ -1,44 +0,0 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread;
import android.view.View;
import android.widget.ImageView;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
@UiThread
@NotNullByDefault
abstract class ConversationOutItemViewHolder
extends ConversationItemViewHolder {
private final ImageView status;
ConversationOutItemViewHolder(View v) {
super(v);
status = v.findViewById(R.id.status);
}
@Override
void bind(ConversationItem conversationItem) {
super.bind(conversationItem);
ConversationOutItem item = (ConversationOutItem) conversationItem;
int res;
if (item.isSeen()) {
if (hasDarkBackground()) res = R.drawable.message_delivered_white;
else res = R.drawable.message_delivered;
} else if (item.isSent()) {
if (hasDarkBackground()) res = R.drawable.message_sent_white;
else res = R.drawable.message_sent;
} else {
if (hasDarkBackground()) res = R.drawable.message_stored_white;
else res = R.drawable.message_stored;
}
status.setImageResource(res);
}
protected abstract boolean hasDarkBackground();
}

14
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestItem.java
View File

@@ -4,7 +4,6 @@ import android.support.annotation.LayoutRes;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.GroupId; import org.briarproject.bramble.api.sync.GroupId;
import org.briarproject.briar.R;
import org.briarproject.briar.api.client.SessionId; import org.briarproject.briar.api.client.SessionId;
import org.briarproject.briar.api.conversation.ConversationRequest; import org.briarproject.briar.api.conversation.ConversationRequest;
import org.briarproject.briar.api.sharing.InvitationRequest; import org.briarproject.briar.api.sharing.InvitationRequest;
@@ -15,7 +14,7 @@ import javax.annotation.concurrent.NotThreadSafe;
@NotThreadSafe @NotThreadSafe
@NotNullByDefault @NotNullByDefault
class ConversationRequestItem extends ConversationNoticeInItem { class ConversationRequestItem extends ConversationNoticeItem {
enum RequestType {INTRODUCTION, FORUM, BLOG, GROUP} enum RequestType {INTRODUCTION, FORUM, BLOG, GROUP}
@@ -26,9 +25,9 @@ class ConversationRequestItem extends ConversationNoticeInItem {
private final boolean canBeOpened; private final boolean canBeOpened;
private boolean answered; private boolean answered;
ConversationRequestItem(String text, RequestType type, ConversationRequest r) { ConversationRequestItem(@LayoutRes int layoutRes, String text,
super(r.getId(), r.getGroupId(), text, r.getText(), RequestType type, ConversationRequest r) {
r.getTimestamp(), r.isRead()); super(layoutRes, text, r);
this.requestType = type; this.requestType = type;
this.sessionId = r.getSessionId(); this.sessionId = r.getSessionId();
this.answered = r.wasAnswered(); this.answered = r.wasAnswered();
@@ -66,9 +65,4 @@ class ConversationRequestItem extends ConversationNoticeInItem {
return canBeOpened; return canBeOpened;
} }
@LayoutRes
@Override
public int getLayout() {
return R.layout.list_item_conversation_request;
}
} }

14
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationRequestViewHolder.java
View File

@@ -13,23 +13,21 @@ import static android.view.View.VISIBLE;
@UiThread @UiThread
@NotNullByDefault @NotNullByDefault
class ConversationRequestViewHolder extends ConversationNoticeInViewHolder { class ConversationRequestViewHolder
extends ConversationNoticeViewHolder<ConversationRequestItem> {
private final Button acceptButton; private final Button acceptButton;
private final Button declineButton; private final Button declineButton;
ConversationRequestViewHolder(View v) { ConversationRequestViewHolder(View v, boolean isIncoming) {
super(v); super(v, isIncoming);
acceptButton = v.findViewById(R.id.acceptButton); acceptButton = v.findViewById(R.id.acceptButton);
declineButton = v.findViewById(R.id.declineButton); declineButton = v.findViewById(R.id.declineButton);
} }
void bind(ConversationItem conversationItem, void bind(ConversationRequestItem item,
ConversationListener listener) { ConversationListener listener) {
super.bind(conversationItem); super.bind(item);
ConversationRequestItem item =
(ConversationRequestItem) conversationItem;
if (item.wasAnswered() && item.canBeOpened()) { if (item.wasAnswered() && item.canBeOpened()) {
acceptButton.setVisibility(VISIBLE); acceptButton.setVisibility(VISIBLE);

58
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
View File

@@ -45,8 +45,13 @@ class ConversationVisitor implements
@Override @Override
public ConversationItem visitPrivateMessageHeader(PrivateMessageHeader h) { public ConversationItem visitPrivateMessageHeader(PrivateMessageHeader h) {
ConversationItem item; ConversationItem item;
if (h.isLocal()) item = new ConversationMessageOutItem(h); if (h.isLocal()) {
else item = new ConversationMessageInItem(h); item = new ConversationMessageItem(
R.layout.list_item_conversation_msg_out, h);
} else {
item = new ConversationMessageItem(
R.layout.list_item_conversation_msg_in, h);
}
String text = textCache.getText(h.getId()); String text = textCache.getText(h.getId());
if (text != null) item.setText(text); if (text != null) item.setText(text);
return item; return item;
@@ -58,12 +63,14 @@ class ConversationVisitor implements
if (r.isLocal()) { if (r.isLocal()) {
String text = ctx.getString(R.string.blogs_sharing_invitation_sent, String text = ctx.getString(R.string.blogs_sharing_invitation_sent,
r.getName(), contactName.getValue()); r.getName(), contactName.getValue());
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text = ctx.getString( String text = ctx.getString(
R.string.blogs_sharing_invitation_received, R.string.blogs_sharing_invitation_received,
contactName.getValue(), r.getName()); contactName.getValue(), r.getName());
return new ConversationRequestItem(text, BLOG, r); return new ConversationRequestItem(
R.layout.list_item_conversation_request, text, BLOG, r);
} }
} }
@@ -81,7 +88,8 @@ class ConversationVisitor implements
R.string.blogs_sharing_response_declined_sent, R.string.blogs_sharing_response_declined_sent,
contactName.getValue()); contactName.getValue());
} }
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text; String text;
if (r.wasAccepted()) { if (r.wasAccepted()) {
@@ -93,7 +101,8 @@ class ConversationVisitor implements
R.string.blogs_sharing_response_declined_received, R.string.blogs_sharing_response_declined_received,
contactName.getValue()); contactName.getValue());
} }
return new ConversationNoticeInItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_in, text, r);
} }
} }
@@ -103,12 +112,14 @@ class ConversationVisitor implements
if (r.isLocal()) { if (r.isLocal()) {
String text = ctx.getString(R.string.forum_invitation_sent, String text = ctx.getString(R.string.forum_invitation_sent,
r.getName(), contactName.getValue()); r.getName(), contactName.getValue());
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text = ctx.getString( String text = ctx.getString(
R.string.forum_invitation_received, R.string.forum_invitation_received,
contactName.getValue(), r.getName()); contactName.getValue(), r.getName());
return new ConversationRequestItem(text, FORUM, r); return new ConversationRequestItem(
R.layout.list_item_conversation_request, text, FORUM, r);
} }
} }
@@ -126,7 +137,8 @@ class ConversationVisitor implements
R.string.forum_invitation_response_declined_sent, R.string.forum_invitation_response_declined_sent,
contactName.getValue()); contactName.getValue());
} }
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text; String text;
if (r.wasAccepted()) { if (r.wasAccepted()) {
@@ -138,7 +150,8 @@ class ConversationVisitor implements
R.string.forum_invitation_response_declined_received, R.string.forum_invitation_response_declined_received,
contactName.getValue()); contactName.getValue());
} }
return new ConversationNoticeInItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_in, text, r);
} }
} }
@@ -149,12 +162,14 @@ class ConversationVisitor implements
String text = ctx.getString( String text = ctx.getString(
R.string.groups_invitations_invitation_sent, R.string.groups_invitations_invitation_sent,
contactName.getValue(), r.getName()); contactName.getValue(), r.getName());
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text = ctx.getString( String text = ctx.getString(
R.string.groups_invitations_invitation_received, R.string.groups_invitations_invitation_received,
contactName.getValue(), r.getName()); contactName.getValue(), r.getName());
return new ConversationRequestItem(text, GROUP, r); return new ConversationRequestItem(
R.layout.list_item_conversation_request, text, GROUP, r);
} }
} }
@@ -172,7 +187,8 @@ class ConversationVisitor implements
R.string.groups_invitations_response_declined_sent, R.string.groups_invitations_response_declined_sent,
contactName.getValue()); contactName.getValue());
} }
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text; String text;
if (r.wasAccepted()) { if (r.wasAccepted()) {
@@ -184,7 +200,8 @@ class ConversationVisitor implements
R.string.groups_invitations_response_declined_received, R.string.groups_invitations_response_declined_received,
contactName.getValue()); contactName.getValue());
} }
return new ConversationNoticeInItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_in, text, r);
} }
} }
@@ -194,11 +211,14 @@ class ConversationVisitor implements
if (r.isLocal()) { if (r.isLocal()) {
String text = ctx.getString(R.string.introduction_request_sent, String text = ctx.getString(R.string.introduction_request_sent,
contactName.getValue(), name); contactName.getValue(), name);
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text = ctx.getString(R.string.introduction_request_received, String text = ctx.getString(R.string.introduction_request_received,
contactName.getValue(), name); contactName.getValue(), name);
return new ConversationRequestItem(text, INTRODUCTION, r); return new ConversationRequestItem(
R.layout.list_item_conversation_request, text, INTRODUCTION,
r);
} }
} }
@@ -221,7 +241,8 @@ class ConversationVisitor implements
R.string.introduction_response_declined_sent, R.string.introduction_response_declined_sent,
introducedAuthor); introducedAuthor);
} }
return new ConversationNoticeOutItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else { } else {
String text; String text;
if (r.wasAccepted()) { if (r.wasAccepted()) {
@@ -240,7 +261,8 @@ class ConversationVisitor implements
contactName.getValue(), contactName.getValue(),
introducedAuthor); introducedAuthor);
} }
return new ConversationNoticeInItem(text, r); return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_in, text, r);
} }
} }

32
briar-android/src/main/java/org/briarproject/briar/android/conversation/OutItemViewHolder.java Normal file
View File

@@ -0,0 +1,32 @@
package org.briarproject.briar.android.conversation;
import android.support.annotation.UiThread;
import android.view.View;
import android.widget.ImageView;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.R;
@UiThread
@NotNullByDefault
class OutItemViewHolder {
private final ImageView status;
OutItemViewHolder(View v) {
status = v.findViewById(R.id.status);
}
void bind(ConversationItem item) {
int res;
if (item.isSeen()) {
res = R.drawable.message_delivered;
} else if (item.isSent()) {
res = R.drawable.message_sent;
} else {
res = R.drawable.message_stored;
}
status.setImageResource(res);
}
}

4
briar-android/src/main/java/org/briarproject/briar/android/login/OpenDatabaseActivity.java
View File

@@ -12,19 +12,19 @@ import org.briarproject.bramble.api.event.EventListener;
import org.briarproject.bramble.api.lifecycle.LifecycleManager; import org.briarproject.bramble.api.lifecycle.LifecycleManager;
import org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState; import org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState;
import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent; import org.briarproject.bramble.api.lifecycle.event.LifecycleEvent;
import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.activity.ActivityComponent; import org.briarproject.briar.android.activity.ActivityComponent;
import org.briarproject.briar.android.activity.BriarActivity; import org.briarproject.briar.android.activity.BriarActivity;
import org.briarproject.briar.android.navdrawer.NavDrawerActivity; import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
import javax.annotation.ParametersAreNonnullByDefault;
import javax.inject.Inject; import javax.inject.Inject;
import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.COMPACTING_DATABASE; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.COMPACTING_DATABASE;
import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.MIGRATING_DATABASE; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.MIGRATING_DATABASE;
import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES; import static org.briarproject.bramble.api.lifecycle.LifecycleManager.LifecycleState.STARTING_SERVICES;
@ParametersAreNonnullByDefault @ParametersNotNullByDefault
public class OpenDatabaseActivity extends BriarActivity public class OpenDatabaseActivity extends BriarActivity
implements EventListener { implements EventListener {

2
briar-android/src/main/res/drawable/message_delivered.xml
View File

@@ -5,6 +5,6 @@
android:viewportHeight="24.0" android:viewportHeight="24.0"
android:viewportWidth="24.0"> android:viewportWidth="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FFFFFFFF"
android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zm4.24,-1.41L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/> android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zm4.24,-1.41L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
</vector> </vector>

10
briar-android/src/main/res/drawable/message_delivered_white.xml
View File

@@ -1,10 +0,0 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zm4.24,-1.41L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
</vector>

2
briar-android/src/main/res/drawable/message_sent.xml
View File

@@ -5,6 +5,6 @@
android:viewportHeight="24.0" android:viewportHeight="24.0"
android:viewportWidth="24.0"> android:viewportWidth="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FFFFFFFF"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/> android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
</vector> </vector>

10
briar-android/src/main/res/drawable/message_sent_white.xml
View File

@@ -1,10 +0,0 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
</vector>

2
briar-android/src/main/res/drawable/message_stored.xml
View File

@@ -4,6 +4,6 @@
android:viewportHeight="24.0" android:viewportHeight="24.0"
android:viewportWidth="24.0"> android:viewportWidth="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FFFFFFFF"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/> android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
</vector> </vector>

5
briar-android/src/main/res/drawable/message_stored_white.xml
View File

@@ -1,5 +0,0 @@
<vector android:height="16dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha=".9" android:fillColor="#FFFFFF" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
</vector>

3
briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
View File

@@ -27,6 +27,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_text_primary_inverse"
app:layout_constraintBottom_toTopOf="@+id/time"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/> tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
@@ -52,7 +53,7 @@
app:layout_constraintStart_toEndOf="@+id/time" app:layout_constraintStart_toEndOf="@+id/time"
app:layout_constraintTop_toTopOf="@+id/time" app:layout_constraintTop_toTopOf="@+id/time"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/message_delivered_white"/> tools:src="@drawable/message_delivered"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

3
briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
View File

@@ -55,7 +55,7 @@
app:layout_constraintTop_toBottomOf="@+id/text" app:layout_constraintTop_toBottomOf="@+id/text"
tools:text="Dec 24, 13:37"/> tools:text="Dec 24, 13:37"/>
<android.support.v7.widget.AppCompatImageView <ImageView
android:id="@+id/status" android:id="@+id/status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -64,7 +64,6 @@
app:layout_constraintBottom_toBottomOf="@+id/time" app:layout_constraintBottom_toBottomOf="@+id/time"
app:layout_constraintStart_toEndOf="@+id/time" app:layout_constraintStart_toEndOf="@+id/time"
app:layout_constraintTop_toTopOf="@+id/time" app:layout_constraintTop_toTopOf="@+id/time"
app:tint="@color/private_message_date_inverse"
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@drawable/message_delivered"/> tools:src="@drawable/message_delivered"/>