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 c9cecd611..328127dc7 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 @@ -327,12 +327,18 @@ class ConversationVisitor implements return new ConversationNoticeItem( R.layout.list_item_conversation_notice_in, text, r); } - default: // WIPE + case WIPE: String text = ctx.getString(R.string.remote_wipe_wipe_sent, contactName.getValue()) + " " + UiUtils .formatDateAbsolute(ctx, r.getMessageExpiry()); 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); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/revoke/RevokeRemoteWipeSuccessFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/revoke/RevokeRemoteWipeSuccessFragment.java index f29290fad..8a1e6cf62 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/revoke/RevokeRemoteWipeSuccessFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/revoke/RevokeRemoteWipeSuccessFragment.java @@ -40,7 +40,7 @@ public class RevokeRemoteWipeSuccessFragment extends BaseFragment { public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_activate_remote_wipe_success, + View view = inflater.inflate(R.layout.fragment_revoke_remote_wipe_success, container, false); Button button = view.findViewById(R.id.button); diff --git a/briar-android/src/main/res/layout/fragment_revoke_remote_wipe_success.xml b/briar-android/src/main/res/layout/fragment_revoke_remote_wipe_success.xml index cdc89f25a..bfe86fb2a 100644 --- a/briar-android/src/main/res/layout/fragment_revoke_remote_wipe_success.xml +++ b/briar-android/src/main/res/layout/fragment_revoke_remote_wipe_success.xml @@ -1,6 +1,51 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/linearLayout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingLeft="@dimen/margin_large" + android:paddingTop="@dimen/margin_medium" + android:paddingRight="@dimen/margin_large" + android:paddingBottom="@dimen/margin_medium"> + +