From 6b10c8885881fce3d686c6a7df26a81cd484ff86 Mon Sep 17 00:00:00 2001
From: ameba23 <ameba23@systemli.org>
Date: Thu, 27 May 2021 12:26:27 +0200
Subject: [PATCH] Add a RemoteWipeActivatedActivity, and listen for the event
 in AndroidNotificationManager

---
 briar-android/src/main/AndroidManifest.xml    |  9 +++++++
 .../AndroidNotificationManagerImpl.java       |  6 +++++
 .../android/activity/ActivityComponent.java   |  3 +++
 .../conversation/ConversationActivity.java    |  2 ++
 .../RemoteWipeActivatedActivity.java          | 24 +++++++++++++++++++
 5 files changed, 44 insertions(+)
 create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeActivatedActivity.java

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index e5615274c..3452e6873 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -472,6 +472,15 @@
 			</intent-filter>
 		</activity>
 
+		<activity
+			android:name="org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity"
+			android:noHistory="true"
+			android:theme="@style/TranslucentTheme">
+			<intent-filter>
+				<action android:name="org.briarproject.briar.android.AndroidNotifiactionManager" />
+			</intent-filter>
+		</activity>
+
 		<activity
 			android:name="org.briarproject.briar.android.remotewipe.RemoteWipeSetupActivity"
 			android:label="@string/activity_name_remote_wipe"
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
index 4b007e3a0..055e15da5 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
@@ -33,6 +33,7 @@ import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.login.SignInReminderReceiver;
 import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
+import org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.util.BriarNotificationBuilder;
 import org.briarproject.briar.api.android.AndroidNotificationManager;
@@ -40,6 +41,7 @@ import org.briarproject.briar.api.blog.event.BlogPostAddedEvent;
 import org.briarproject.briar.api.conversation.event.ConversationMessageReceivedEvent;
 import org.briarproject.briar.api.forum.event.ForumPostReceivedEvent;
 import org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent;
+import org.briarproject.briar.api.remotewipe.RemoteWipeActivatedEvent;
 
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -240,6 +242,10 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 			ContactAddedEvent c = (ContactAddedEvent) e;
 			// Don't show notifications for contacts added in person
 			if (!c.isVerified()) showContactAddedNotification();
+		} else if (e instanceof RemoteWipeActivatedEvent) {
+			Intent i = new Intent(appContext, RemoteWipeActivatedActivity.class);
+			i.addFlags(FLAG_ACTIVITY_NEW_TASK);
+			appContext.startActivity(i);
 		}
 	}
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
index be7c1048a..178df5d3d 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java
@@ -65,6 +65,7 @@ import org.briarproject.briar.android.privategroup.memberlist.GroupMemberModule;
 import org.briarproject.briar.android.privategroup.reveal.GroupRevealModule;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsActivity;
 import org.briarproject.briar.android.privategroup.reveal.RevealContactsFragment;
+import org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity;
 import org.briarproject.briar.android.remotewipe.RemoteWipeDisplayFragment;
 import org.briarproject.briar.android.remotewipe.RemoteWipeSetupActivity;
 import org.briarproject.briar.android.remotewipe.RemoteWipeSuccessFragment;
@@ -226,6 +227,8 @@ public interface ActivityComponent {
 
     void inject(ActivateRemoteWipeActivity activateRemoteWipeActivity);
 
+    void inject(RemoteWipeActivatedActivity remoteWipeActivatedActivity);
+
 	// Fragments
 
 	void inject(AuthorNameFragment fragment);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
index c7f3a6385..f6f6a6f6d 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
@@ -52,6 +52,7 @@ import org.briarproject.briar.android.conversation.ConversationVisitor.TextCache
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.introduction.IntroductionActivity;
 import org.briarproject.briar.android.privategroup.conversation.GroupActivity;
+import org.briarproject.briar.android.remotewipe.RemoteWipeActivatedActivity;
 import org.briarproject.briar.android.remotewipe.activate.ActivateRemoteWipeActivity;
 import org.briarproject.briar.android.socialbackup.recover.CustodianReturnShardActivity;
 import org.briarproject.briar.android.util.BriarSnackbarBuilder;
@@ -78,6 +79,7 @@ import org.briarproject.briar.api.introduction.IntroductionManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.privategroup.invitation.GroupInvitationManager;
+import org.briarproject.briar.api.remotewipe.RemoteWipeActivatedEvent;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeActivatedActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeActivatedActivity.java
new file mode 100644
index 000000000..df76a0cb7
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/remotewipe/RemoteWipeActivatedActivity.java
@@ -0,0 +1,24 @@
+package org.briarproject.briar.android.remotewipe;
+
+import android.os.Bundle;
+
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+
+import javax.annotation.Nullable;
+
+
+public class RemoteWipeActivatedActivity extends BriarActivity {
+
+	@Override
+	public void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		signOut(true, true);
+	}
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+}