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

Add revoke remote wipe conversation notification on revoke received

Browse Source
This commit is contained in:
ameba23
2021-08-31 12:59:39 +02:00
parent 9a28203437
commit 03a624ab8f
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -334,11 +334,25 @@ class ConversationVisitor implements
return new ConversationNoticeItem( return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r); R.layout.list_item_conversation_notice_out, text, r);
default: // REVOKE default: // REVOKE
String revokeText = ctx.getString(R.string.remote_wipe_revoke_sent, if (r.isLocal()) {
contactName.getValue()) + " " + UiUtils String revokeText =
.formatDateAbsolute(ctx, r.getMessageExpiry()); ctx.getString(R.string.remote_wipe_revoke_sent,
return new ConversationNoticeItem( contactName.getValue()) + " " + UiUtils
R.layout.list_item_conversation_notice_out, revokeText, r); .formatDateAbsolute(ctx,
r.getMessageExpiry());
return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out,
revokeText, r);
} else {
String revokeText =
ctx.getString(R.string.remote_wipe_revoke_received,
contactName.getValue()) + " " + UiUtils
.formatDateAbsolute(ctx,
r.getMessageExpiry());
return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out,
revokeText, r);
}
} }
} }

1
briar-android/src/main/res/values/strings.xml
View File

@@ -751,6 +751,7 @@
<string name="assigned_wipers">Your assigned trusted wipers</string> <string name="assigned_wipers">Your assigned trusted wipers</string>
<string name="activate_remote_wipe">Activate remote wipe</string> <string name="activate_remote_wipe">Activate remote wipe</string>
<string name="remote_wipe_revoke_sent">%1$s may no longer activate a remote wipe.</string> <string name="remote_wipe_revoke_sent">%1$s may no longer activate a remote wipe.</string>
<string name="remote_wipe_revoke_received">You can no longer activate a remote wipe for %1$s.</string>
<!-- activate --> <!-- activate -->
<string name="activity_name_activate_remote_wipe">Activate Remote Wipe</string> <string name="activity_name_activate_remote_wipe">Activate Remote Wipe</string>