diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
index 328127dc7..676e4cbf0 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationVisitor.java
@@ -334,11 +334,25 @@ class ConversationVisitor implements
return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
default: // REVOKE
- String revokeText = ctx.getString(R.string.remote_wipe_revoke_sent,
- contactName.getValue()) + " " + UiUtils
- .formatDateAbsolute(ctx, r.getMessageExpiry());
- return new ConversationNoticeItem(
- R.layout.list_item_conversation_notice_out, revokeText, r);
+ if (r.isLocal()) {
+ String revokeText =
+ ctx.getString(R.string.remote_wipe_revoke_sent,
+ contactName.getValue()) + " " + UiUtils
+ .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);
+ }
}
}
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 907404d14..4b43cd2b5 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -751,6 +751,7 @@
Your assigned trusted wipers
Activate remote wipe
%1$s may no longer activate a remote wipe.
+ You can no longer activate a remote wipe for %1$s.
Activate Remote Wipe