From 75370c8124f7d69118054a61260a96429d7df907 Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Tue, 11 Jan 2022 14:41:50 +0100
Subject: [PATCH 1/5] Refuse to start on Android 4 beyond the set expiry date

---
 briar-android/src/main/AndroidManifest.xml    |  4 ++
 .../android/activity/ActivityComponent.java   |  3 ++
 .../splash/ExpiredOldAndroidActivity.java     | 42 +++++++++++++++++
 .../android/splash/SplashScreenActivity.java  | 11 +++--
 .../layout/activity_expired_old_android.xml   | 45 +++++++++++++++++++
 briar-android/src/main/res/values/strings.xml |  4 ++
 6 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
 create mode 100644 briar-android/src/main/res/layout/activity_expired_old_android.xml

diff --git a/briar-android/src/main/AndroidManifest.xml b/briar-android/src/main/AndroidManifest.xml
index 27956ce43..edcea26a7 100644
--- a/briar-android/src/main/AndroidManifest.xml
+++ b/briar-android/src/main/AndroidManifest.xml
@@ -99,6 +99,10 @@
 			android:name="org.briarproject.briar.android.splash.ExpiredActivity"
 			android:label="@string/app_name" />
 
+		<activity
+			android:name="org.briarproject.briar.android.splash.ExpiredOldAndroidActivity"
+			android:label="@string/app_name" />
+
 		<activity
 			android:name="org.briarproject.briar.android.login.StartupActivity"
 			android:label="@string/app_name" />
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 8c0a30735..43baf5816 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
@@ -80,6 +80,7 @@ import org.briarproject.briar.android.sharing.ShareBlogFragment;
 import org.briarproject.briar.android.sharing.ShareForumActivity;
 import org.briarproject.briar.android.sharing.ShareForumFragment;
 import org.briarproject.briar.android.sharing.SharingModule;
+import org.briarproject.briar.android.splash.ExpiredOldAndroidActivity;
 import org.briarproject.briar.android.splash.SplashScreenActivity;
 import org.briarproject.briar.android.test.TestDataActivity;
 
@@ -182,6 +183,8 @@ public interface ActivityComponent {
 
 	void inject(RemovableDriveActivity activity);
 
+	void inject(ExpiredOldAndroidActivity activity);
+
 	// Fragments
 
 	void inject(SetupFragment fragment);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
new file mode 100644
index 000000000..025363afe
--- /dev/null
+++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
@@ -0,0 +1,42 @@
+package org.briarproject.briar.android.splash;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.Localizer;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+
+import javax.annotation.Nullable;
+
+import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
+import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
+
+@NotNullByDefault
+public class ExpiredOldAndroidActivity extends BriarActivity {
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+
+		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
+
+		setContentView(R.layout.activity_expired_old_android);
+		findViewById(R.id.delete_account_button).setOnClickListener(v ->
+				signOut(true, true));
+	}
+
+	@Override
+	protected void attachBaseContext(Context base) {
+		super.attachBaseContext(
+				Localizer.getInstance().setLocale(base));
+		Localizer.getInstance().setLocale(this);
+	}
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+}
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
index 81b3e75c6..b8905f764 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/SplashScreenActivity.java
@@ -65,9 +65,14 @@ public class SplashScreenActivity extends BaseActivity {
 			int duration =
 					getResources().getInteger(R.integer.splashScreenDuration);
 			new Handler().postDelayed(() -> {
-				if (IS_DEBUG_BUILD && currentTimeMillis() >= EXPIRY_DATE) {
-					LOG.info("Expired");
-					startNextActivity(ExpiredActivity.class);
+				if (currentTimeMillis() >= EXPIRY_DATE) {
+					if (IS_DEBUG_BUILD) {
+						LOG.info("Expired: debug build");
+						startNextActivity(ExpiredActivity.class);
+					} else {
+						LOG.info("Expired: running on old Android");
+						startNextActivity(ExpiredOldAndroidActivity.class);
+					}
 				} else {
 					startNextActivity(ENTRY_ACTIVITY);
 				}
diff --git a/briar-android/src/main/res/layout/activity_expired_old_android.xml b/briar-android/src/main/res/layout/activity_expired_old_android.xml
new file mode 100644
index 000000000..c1bf01684
--- /dev/null
+++ b/briar-android/src/main/res/layout/activity_expired_old_android.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:orientation="vertical">
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:gravity="center"
+			android:text="@string/old_android_expiry_date_reached"
+			android:textSize="@dimen/text_size_large" />
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:gravity="center"
+			android:text="@string/old_android_create_new_account"
+			android:textSize="@dimen/text_size_large" />
+
+		<TextView
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:gravity="center"
+			android:text="@string/old_android_delete_account"
+			android:textSize="@dimen/text_size_large" />
+
+		<Button
+			android:id="@+id/delete_account_button"
+			style="@style/BriarButton"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="@dimen/margin_medium"
+			android:text="@string/delete_account_button" />
+	</LinearLayout>
+</ScrollView>
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 41a5fc249..499a015c1 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -64,6 +64,10 @@
 	<string name="download_briar">To continue using Briar, please download the latest release.</string>
 	<string name="create_new_account">You will need to create a new account, but you can use the same nickname.</string>
 	<string name="download_briar_button">Download Latest Release</string>
+	<string name="old_android_expiry_date_reached">Briar no longer runs on Android 4.\nPlease install Briar on a newer device.</string>
+	<string name="old_android_create_new_account">You will need to create a new account, but you can use the same nickname.</string>
+	<string name="old_android_delete_account">You can tap the button below to delete your account from this device.</string>
+	<string name="delete_account_button">Delete Account</string>
 	<string name="startup_open_database">Decrypting Database…</string>
 	<string name="startup_migrate_database">Upgrading Database…</string>
 	<string name="startup_compact_database">Compacting Database…</string>

From 94367572154852f9b0cc38af8eda6f3a352eff7d Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Wed, 12 Jan 2022 09:09:13 +0100
Subject: [PATCH 2/5] Reuse existing string (same kind of context)

---
 .../src/main/res/layout/activity_expired_old_android.xml        | 2 +-
 briar-android/src/main/res/values/strings.xml                   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/briar-android/src/main/res/layout/activity_expired_old_android.xml b/briar-android/src/main/res/layout/activity_expired_old_android.xml
index c1bf01684..2d21398ae 100644
--- a/briar-android/src/main/res/layout/activity_expired_old_android.xml
+++ b/briar-android/src/main/res/layout/activity_expired_old_android.xml
@@ -23,7 +23,7 @@
 			android:layout_height="wrap_content"
 			android:layout_margin="@dimen/margin_medium"
 			android:gravity="center"
-			android:text="@string/old_android_create_new_account"
+			android:text="@string/create_new_account"
 			android:textSize="@dimen/text_size_large" />
 
 		<TextView
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 499a015c1..e2842fc44 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -65,7 +65,6 @@
 	<string name="create_new_account">You will need to create a new account, but you can use the same nickname.</string>
 	<string name="download_briar_button">Download Latest Release</string>
 	<string name="old_android_expiry_date_reached">Briar no longer runs on Android 4.\nPlease install Briar on a newer device.</string>
-	<string name="old_android_create_new_account">You will need to create a new account, but you can use the same nickname.</string>
 	<string name="old_android_delete_account">You can tap the button below to delete your account from this device.</string>
 	<string name="delete_account_button">Delete Account</string>
 	<string name="startup_open_database">Decrypting Database…</string>

From 171df265abac514c87f96a2705e8315a9ca90c6d Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Mon, 17 Jan 2022 11:04:50 +0100
Subject: [PATCH 3/5] Let our activity actually show up, by avoiding to extend
 BriarActivity

If user needs to sign in or create an account, BriarActivity launches
StartupActivity. But we want to show up before that.

Implement our own signOut with BriarActivity as a template.
---
 .../splash/ExpiredOldAndroidActivity.java     | 55 +++++++++++++++++--
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
index 025363afe..cbc463daf 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
@@ -1,21 +1,38 @@
 package org.briarproject.briar.android.splash;
 
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 
-import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
+import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
+import org.briarproject.bramble.api.system.AndroidWakeLockManager;
+import org.briarproject.bramble.api.system.Wakeful;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.Localizer;
 import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.activity.BaseActivity;
+import org.briarproject.briar.android.controller.BriarController;
+import org.briarproject.briar.android.logout.ExitActivity;
 
 import javax.annotation.Nullable;
+import javax.inject.Inject;
 
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
 import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
 import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
 
-@NotNullByDefault
-public class ExpiredOldAndroidActivity extends BriarActivity {
+@MethodsNotNullByDefault
+@ParametersNotNullByDefault
+public class ExpiredOldAndroidActivity extends BaseActivity {
+
+	@Inject
+	BriarController briarController;
+	@Inject
+	AndroidWakeLockManager wakeLockManager;
 
 	@Override
 	public void onCreate(@Nullable Bundle state) {
@@ -25,7 +42,7 @@ public class ExpiredOldAndroidActivity extends BriarActivity {
 
 		setContentView(R.layout.activity_expired_old_android);
 		findViewById(R.id.delete_account_button).setOnClickListener(v ->
-				signOut(true, true));
+				signOutAndDeleteAccount());
 	}
 
 	@Override
@@ -39,4 +56,32 @@ public class ExpiredOldAndroidActivity extends BriarActivity {
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
 	}
+
+	private void signOutAndDeleteAccount() {
+		// Hold a wake lock to ensure we exit before the device goes to sleep
+		wakeLockManager.runWakefully(() -> {
+			if (briarController.accountSignedIn()) {
+				// Don't use UiResultHandler because we want the result even if
+				// this activity has been destroyed
+				briarController.signOut(result -> {
+					Runnable exit = this::startExitActivity;
+					wakeLockManager.executeWakefully(exit,
+							this::runOnUiThread, "SignOut");
+				}, true);
+			} else {
+				briarController.deleteAccount();
+				startExitActivity();
+			}
+		}, "SignOut");
+	}
+
+	@Wakeful
+	private void startExitActivity() {
+		Intent i = new Intent(this, ExitActivity.class);
+		i.addFlags(FLAG_ACTIVITY_NEW_TASK
+				| FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+				| FLAG_ACTIVITY_NO_ANIMATION
+				| FLAG_ACTIVITY_CLEAR_TASK);
+		startActivity(i);
+	}
 }

From 39eebe4c02d184b4a2f36cd61950caa0daab4a74 Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Mon, 17 Jan 2022 11:13:38 +0100
Subject: [PATCH 4/5] Remove, BaseActivity does this

---
 .../android/splash/ExpiredOldAndroidActivity.java   | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
index cbc463daf..7291e79e0 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
@@ -1,6 +1,5 @@
 package org.briarproject.briar.android.splash;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -9,7 +8,6 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.system.AndroidWakeLockManager;
 import org.briarproject.bramble.api.system.Wakeful;
 import org.briarproject.briar.R;
-import org.briarproject.briar.android.Localizer;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BaseActivity;
 import org.briarproject.briar.android.controller.BriarController;
@@ -22,8 +20,6 @@ import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;
-import static android.view.WindowManager.LayoutParams.FLAG_SECURE;
-import static org.briarproject.briar.android.TestingConstants.PREVENT_SCREENSHOTS;
 
 @MethodsNotNullByDefault
 @ParametersNotNullByDefault
@@ -38,20 +34,11 @@ public class ExpiredOldAndroidActivity extends BaseActivity {
 	public void onCreate(@Nullable Bundle state) {
 		super.onCreate(state);
 
-		if (PREVENT_SCREENSHOTS) getWindow().addFlags(FLAG_SECURE);
-
 		setContentView(R.layout.activity_expired_old_android);
 		findViewById(R.id.delete_account_button).setOnClickListener(v ->
 				signOutAndDeleteAccount());
 	}
 
-	@Override
-	protected void attachBaseContext(Context base) {
-		super.attachBaseContext(
-				Localizer.getInstance().setLocale(base));
-		Localizer.getInstance().setLocale(this);
-	}
-
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);

From 9e5201d5715e6ac4519c1570b9110fb62184f076 Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Mon, 17 Jan 2022 13:08:02 +0100
Subject: [PATCH 5/5] Don't try to sign out; we know we aren't signed in

---
 .../splash/ExpiredOldAndroidActivity.java     | 45 ++++++-------------
 1 file changed, 14 insertions(+), 31 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
index 7291e79e0..43cf53988 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/splash/ExpiredOldAndroidActivity.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.bramble.api.system.AndroidWakeLockManager;
-import org.briarproject.bramble.api.system.Wakeful;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BaseActivity;
@@ -35,40 +34,24 @@ public class ExpiredOldAndroidActivity extends BaseActivity {
 		super.onCreate(state);
 
 		setContentView(R.layout.activity_expired_old_android);
-		findViewById(R.id.delete_account_button).setOnClickListener(v ->
-				signOutAndDeleteAccount());
+		findViewById(R.id.delete_account_button).setOnClickListener(v -> {
+			// Hold a wake lock to ensure we exit before the device goes to sleep
+			wakeLockManager.runWakefully(() -> {
+				// we're not signed in, just go ahead and delete
+				briarController.deleteAccount();
+				// remove from recent apps
+				Intent i = new Intent(this, ExitActivity.class);
+				i.addFlags(FLAG_ACTIVITY_NEW_TASK
+						| FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
+						| FLAG_ACTIVITY_NO_ANIMATION
+						| FLAG_ACTIVITY_CLEAR_TASK);
+				startActivity(i);
+			}, "DeleteAccount");
+		});
 	}
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
 		component.inject(this);
 	}
-
-	private void signOutAndDeleteAccount() {
-		// Hold a wake lock to ensure we exit before the device goes to sleep
-		wakeLockManager.runWakefully(() -> {
-			if (briarController.accountSignedIn()) {
-				// Don't use UiResultHandler because we want the result even if
-				// this activity has been destroyed
-				briarController.signOut(result -> {
-					Runnable exit = this::startExitActivity;
-					wakeLockManager.executeWakefully(exit,
-							this::runOnUiThread, "SignOut");
-				}, true);
-			} else {
-				briarController.deleteAccount();
-				startExitActivity();
-			}
-		}, "SignOut");
-	}
-
-	@Wakeful
-	private void startExitActivity() {
-		Intent i = new Intent(this, ExitActivity.class);
-		i.addFlags(FLAG_ACTIVITY_NEW_TASK
-				| FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
-				| FLAG_ACTIVITY_NO_ANIMATION
-				| FLAG_ACTIVITY_CLEAR_TASK);
-		startActivity(i);
-	}
 }