Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-04 07:25:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix success/failure status on conversation item.

Browse Source
This commit is contained in:
Moxie Marlinspike
2012-08-03 17:34:09 -07:00
parent cffedb09a1
commit 7883d09573
8 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/ConversationItem.java
View File

@@ -135,10 +135,7 @@ public class ConversationItem extends LinearLayout {
public void setMessageRecord(MessageRecord messageRecord) {
setBody(messageRecord);
setDate(messageRecord.getDate());
setStatusIcons(messageRecord);
setEvents(messageRecord);
}
@@ -268,10 +265,6 @@ public class ConversationItem extends LinearLayout {
return (number != null) && (number.trim().length() > 0);
}
private void setDate(long date) {
dateText.setText(DateUtils.getRelativeTimeSpanString(getContext(), date, false));
}
private void setStatusIcons(MessageRecord messageRecord) {
failedImage.setVisibility(messageRecord.isFailed() ? View.VISIBLE : View.GONE);
secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
@@ -280,6 +273,12 @@ public class ConversationItem extends LinearLayout {
mmsThumbnail.setVisibility(View.GONE);
mmsDownloadButton.setVisibility(View.GONE);
mmsDownloadingLabel.setVisibility(View.GONE);
if (messageRecord.isFailed()) dateText.setText("Error sending message");
else if (messageRecord.isPending()) dateText.setText("Sending...");
else dateText.setText(DateUtils.getRelativeTimeSpanString(getContext(),
messageRecord.getDate(),
false));
}
private void setEvents(MessageRecord messageRecord) {