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

Display expiration date on outgoing remote wipe message notification

Browse Source
This commit is contained in:
ameba23
2021-06-03 09:37:15 +02:00
parent ab136d3167
commit 2177036044
5 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.bramble.api.sync.MessageId; import org.briarproject.bramble.api.sync.MessageId;
import org.briarproject.briar.R; import org.briarproject.briar.R;
import org.briarproject.briar.android.attachment.AttachmentItem; import org.briarproject.briar.android.attachment.AttachmentItem;
import org.briarproject.briar.android.util.UiUtils;
import org.briarproject.briar.api.blog.BlogInvitationRequest; import org.briarproject.briar.api.blog.BlogInvitationRequest;
import org.briarproject.briar.api.blog.BlogInvitationResponse; import org.briarproject.briar.api.blog.BlogInvitationResponse;
import org.briarproject.briar.api.conversation.ConversationMessageVisitor; import org.briarproject.briar.api.conversation.ConversationMessageVisitor;
@@ -16,7 +17,6 @@ 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.MessageType;
import org.briarproject.briar.api.remotewipe.RemoteWipeMessageHeader; import org.briarproject.briar.api.remotewipe.RemoteWipeMessageHeader;
import org.briarproject.briar.api.socialbackup.ShardMessageHeader; import org.briarproject.briar.api.socialbackup.ShardMessageHeader;
@@ -315,16 +315,22 @@ class ConversationVisitor implements
switch (r.getMessageType()) { switch (r.getMessageType()) {
case SETUP: case SETUP:
if (r.isLocal()) { if (r.isLocal()) {
String text = ctx.getString(R.string.remote_wipe_setup_sent, contactName.getValue()); String text = ctx.getString(R.string.remote_wipe_setup_sent,
contactName.getValue());
return new ConversationNoticeItem( return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r); R.layout.list_item_conversation_notice_out, text,
r);
} else { } else {
String text = ctx.getString(R.string.remote_wipe_setup_received, contactName.getValue()); String text =
ctx.getString(R.string.remote_wipe_setup_received,
contactName.getValue());
return new ConversationNoticeItem( return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_in, text, r); R.layout.list_item_conversation_notice_in, text, r);
} }
default: // WIPE default: // WIPE
String text = ctx.getString(R.string.remote_wipe_wipe_sent, contactName.getValue()); String text = ctx.getString(R.string.remote_wipe_wipe_sent,
contactName.getValue()) + " " + UiUtils
.formatDateAbsolute(ctx, r.getMessageExpiry());
return new ConversationNoticeItem( return new ConversationNoticeItem(
R.layout.list_item_conversation_notice_out, text, r); R.layout.list_item_conversation_notice_out, text, r);
} }

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

@@ -747,7 +747,7 @@
<!-- conversation --> <!-- conversation -->
<string name="remote_wipe_setup_received">%1$s has added you as a remote wiper.</string> <string name="remote_wipe_setup_received">%1$s has added you as a remote wiper.</string>
<string name="remote_wipe_setup_sent">You have added %1$s as a remote wiper.</string> <string name="remote_wipe_setup_sent">You have added %1$s as a remote wiper.</string>
<string name="remote_wipe_wipe_sent">You have sent an activate remote wipe signal to %1$s.</string> <string name="remote_wipe_wipe_sent">You have sent an activate remote wipe signal to %1$s. It expires </string>
<string name="activity_name_remote_wipe">Remote Wipe</string> <string name="activity_name_remote_wipe">Remote Wipe</string>
<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>

2
briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeConstants.java
View File

@@ -1,4 +1,4 @@
package org.briarproject.briar.remotewipe; package org.briarproject.briar.api.remotewipe;
public interface RemoteWipeConstants { public interface RemoteWipeConstants {

4
briar-api/src/main/java/org/briarproject/briar/api/remotewipe/RemoteWipeMessageHeader.java
View File

@@ -34,6 +34,10 @@ public class RemoteWipeMessageHeader extends ConversationMessageHeader {
return type; return type;
} }
public long getMessageExpiry() {
return (getTimestamp() + RemoteWipeConstants.MAX_MESSAGE_AGE);
}
@Override @Override
public <T> T accept(ConversationMessageVisitor<T> v) { public <T> T accept(ConversationMessageVisitor<T> v) {
return v.visitRemoteWipeMessage(this); return v.visitRemoteWipeMessage(this);

16
briar-core/src/main/java/org/briarproject/briar/remotewipe/RemoteWipeManagerImpl.java
View File

@@ -50,14 +50,14 @@ import static java.util.logging.Logger.getLogger;
import static org.briarproject.briar.api.remotewipe.MessageType.SETUP; import static org.briarproject.briar.api.remotewipe.MessageType.SETUP;
import static org.briarproject.briar.api.remotewipe.MessageType.WIPE; import static org.briarproject.briar.api.remotewipe.MessageType.WIPE;
import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ; import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.GROUP_KEY_CONTACT_ID; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_CONTACT_ID;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.GROUP_KEY_RECEIVED_WIPE; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_RECEIVED_WIPE;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.GROUP_KEY_WIPERS; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.GROUP_KEY_WIPERS;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.MAX_MESSAGE_AGE; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MAX_MESSAGE_AGE;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.MSG_KEY_LOCAL; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_LOCAL;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.MSG_KEY_MESSAGE_TYPE; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_MESSAGE_TYPE;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.MSG_KEY_TIMESTAMP; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.MSG_KEY_TIMESTAMP;
import static org.briarproject.briar.remotewipe.RemoteWipeConstants.THRESHOLD; import static org.briarproject.briar.api.remotewipe.RemoteWipeConstants.THRESHOLD;
public class RemoteWipeManagerImpl extends ConversationClientImpl public class RemoteWipeManagerImpl extends ConversationClientImpl
implements RemoteWipeManager, ContactManager.ContactHook, implements RemoteWipeManager, ContactManager.ContactHook,