oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity

Merge pull request #805 from wickedshimmy/fix-sender-details

Browse source 
Don't display sender in outgoing message details
This commit is contained in:
Jake McGinty 2014-02-27 11:18:51 -08:00
parent 038bebfdbb 852ca2ac05
commit bac4d63312
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/strings.xml
View file

@ -86,7 +86,7 @@
<!-- ConversationFragment -->
<string name="ConversationFragment_message_details">Message details</string>
<string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s\nTransport: %2$s\nSent/Received:%3$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_received_s">Transport: %1$s\nSent/Received:%2$s</string>
<string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSent: %3$s\nReceived:%4$s</string>
<string name="ConversationFragment_confirm_message_delete">Confirm Message Delete</string>
<string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Are you sure that you want to permanently delete this message?</string>

6
src/org/thoughtcrime/securesms/ConversationFragment.java
View file

@ -136,7 +136,6 @@ public class ConversationFragment extends SherlockListFragment
}
private void handleDisplayDetails(MessageRecord message) {
String sender = message.getIndividualRecipient().getNumber();
long dateReceived = message.getDateReceived();
long dateSent = message.getDateSent();
@ -156,12 +155,13 @@ public class ConversationFragment extends SherlockListFragment
if (dateReceived == dateSent || message.isOutgoing()) {
builder.setMessage(String.format(getSherlockActivity()
.getString(R.string.ConversationFragment_sender_s_transport_s_sent_received_s),
sender, transport.toUpperCase(),
transport.toUpperCase(),
dateFormatter.format(new Date(dateSent))));
} else {
builder.setMessage(String.format(getSherlockActivity()
.getString(R.string.ConversationFragment_sender_s_transport_s_sent_s_received_s),
sender, transport.toUpperCase(),
message.getIndividualRecipient().getNumber(),
transport.toUpperCase(),
dateFormatter.format(new Date(dateSent)),
dateFormatter.format(new Date(dateReceived))));
}