Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Display message when getting or sending a remote wipe setup message

Browse Source
This commit is contained in:
ameba23
2021-05-06 18:30:51 +02:00
parent a93cbf852b
commit 7659b9decb
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationNoticeItem.java
View File

@@ -3,6 +3,7 @@ package org.briarproject.briar.android.conversation;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.api.conversation.ConversationRequest; import org.briarproject.briar.api.conversation.ConversationRequest;
import org.briarproject.briar.api.conversation.ConversationResponse; import org.briarproject.briar.api.conversation.ConversationResponse;
import org.briarproject.briar.api.remotewipe.RemoteWipeMessageHeader;
import org.briarproject.briar.api.socialbackup.ShardMessageHeader; import org.briarproject.briar.api.socialbackup.ShardMessageHeader;
import javax.annotation.Nullable; import javax.annotation.Nullable;
@@ -38,6 +39,13 @@ class ConversationNoticeItem extends ConversationItem {
this.msgText = null; this.msgText = null;
} }
ConversationNoticeItem(@LayoutRes int layoutRes, String text,
RemoteWipeMessageHeader r) {
super(layoutRes, r);
this.text = text;
this.msgText = null;
}
@Nullable @Nullable
String getMsgText() { String getMsgText() {
return msgText; return msgText;

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

@@ -16,6 +16,7 @@ import org.briarproject.briar.api.introduction.IntroductionResponse;
import org.briarproject.briar.api.messaging.PrivateMessageHeader; import org.briarproject.briar.api.messaging.PrivateMessageHeader;
import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest;
import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse; import org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse;
import org.briarproject.briar.api.remotewipe.RemoteWipeMessageHeader;
import org.briarproject.briar.api.socialbackup.ShardMessageHeader; import org.briarproject.briar.api.socialbackup.ShardMessageHeader;
import java.util.List; import java.util.List;
@@ -306,6 +307,19 @@ class ConversationVisitor implements
} }
} }
@Override
public ConversationItem visitRemoteWipeMessage(RemoteWipeMessageHeader r) {
if (r.isLocal()) {
String text = ctx.getString(R.string.remote_wipe_setup_sent);
return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r);
} else {
String text = ctx.getString(R.string.remote_wipe_setup_received);
return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_in, text, r);
}
}
interface TextCache { interface TextCache {
@Nullable @Nullable
String getText(MessageId m); String getText(MessageId m);

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

@@ -729,4 +729,11 @@
<string name="activity_name_new_or_recover_account">Create new account or recover existing account</string> <string name="activity_name_new_or_recover_account">Create new account or recover existing account</string>
<string name="activity_name_recovery">Recover Account</string> <string name="activity_name_recovery">Recover Account</string>
<string name="activity_name_custodian_help_recovery">Help recover account</string> <string name="activity_name_custodian_help_recovery">Help recover account</string>
<!-- Remote Wipe -->
<!-- conversation -->
<string name="remote_wipe_setup_received">You have been added a remote wiper.</string>
<string name="remote_wipe_setup_sent">You have added this contact as a remote wiper.</string>
</resources> </resources>