Show startup failure activity immediately, without a notification.

briar-android/src/main/AndroidManifest.xml

@@ -343,7 +343,13 @@
 
 		<activity
 			android:name="org.briarproject.briar.android.StartupFailureActivity"
-			android:label="@string/startup_failed_activity_title" />
+			android:excludeFromRecents="true"
+			android:exported="false"
+			android:finishOnTaskLaunch="true"
+			android:label="@string/startup_failed_activity_title"
+			android:launchMode="singleInstance"
+			android:process=":briar_startup_failure"
+			android:windowSoftInputMode="adjustResize|stateHidden" />
 
 		<activity
 			android:name="org.briarproject.briar.android.settings.SettingsActivity"

briar-android/src/main/java/org/briarproject/briar/android/BriarService.java

@@ -3,7 +3,6 @@ package org.briarproject.briar.android;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -34,11 +33,7 @@ import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 
-import androidx.core.app.NotificationCompat;
-
-import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.content.Intent.ACTION_SHUTDOWN;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
@@ -55,7 +50,6 @@ import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResul
 import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
 import static org.briarproject.briar.android.BriarApplication.ENTRY_ACTIVITY;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_CHANNEL_ID;
-import static org.briarproject.briar.api.android.AndroidNotificationManager.FAILURE_NOTIFICATION_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_CHANNEL_OLD_ID;
 import static org.briarproject.briar.api.android.AndroidNotificationManager.ONGOING_NOTIFICATION_ID;
@@ -66,8 +60,6 @@ public class BriarService extends Service {
 
 	public static String EXTRA_START_RESULT =
 			"org.briarproject.briar.START_RESULT";
-	public static String EXTRA_NOTIFICATION_ID =
-			"org.briarproject.briar.FAILURE_NOTIFICATION_ID";
 	public static String EXTRA_STARTUP_FAILED =
 			"org.briarproject.briar.STARTUP_FAILED";
 
@@ -135,12 +127,9 @@ public class BriarService extends Service {
 				ongoingChannel.setLockscreenVisibility(VISIBILITY_SECRET);
 				ongoingChannel.setShowBadge(false);
 				nm.createNotificationChannel(ongoingChannel);
-				NotificationChannel failureChannel = new NotificationChannel(
-						FAILURE_CHANNEL_ID,
-						getString(R.string.startup_failed_notification_title),
-						IMPORTANCE_DEFAULT);
-				failureChannel.setLockscreenVisibility(VISIBILITY_SECRET);
-				nm.createNotificationChannel(failureChannel);
+				// Delete the unused channel previously used for startup
+				// failure notifications
+				nm.deleteNotificationChannel(FAILURE_CHANNEL_ID);
 			}
 			Notification foregroundNotification =
 					notificationManager.getForegroundNotification();
@@ -184,27 +173,11 @@ public class BriarService extends Service {
 
 	private void showStartupFailureNotification(StartResult result) {
 		androidExecutor.runOnUiThread(() -> {
-			NotificationCompat.Builder b = new NotificationCompat.Builder(
-					BriarService.this, FAILURE_CHANNEL_ID);
-			b.setSmallIcon(android.R.drawable.stat_notify_error);
-			b.setContentTitle(getText(
-					R.string.startup_failed_notification_title));
-			b.setContentText(getText(
-					R.string.startup_failed_notification_text));
-			Intent i = new Intent(BriarService.this,
-					StartupFailureActivity.class);
-			i.setFlags(FLAG_ACTIVITY_NEW_TASK);
-			i.putExtra(EXTRA_START_RESULT, result);
-			i.putExtra(EXTRA_NOTIFICATION_ID, FAILURE_NOTIFICATION_ID);
-			b.setContentIntent(PendingIntent.getActivity(BriarService.this,
-					0, i, FLAG_UPDATE_CURRENT));
-			NotificationManager nm = (NotificationManager)
-					requireNonNull(getSystemService(NOTIFICATION_SERVICE));
-			nm.notify(FAILURE_NOTIFICATION_ID, b.build());
-			// Bring the dashboard to the front to clear the back stack
-			i = new Intent(BriarService.this, ENTRY_ACTIVITY);
+			// Bring the entry activity to the front to clear the back stack
+			Intent i = new Intent(BriarService.this, ENTRY_ACTIVITY);
 			i.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TOP);
 			i.putExtra(EXTRA_STARTUP_FAILED, true);
+			i.putExtra(EXTRA_START_RESULT, result);
 			startActivity(i);
 		});
 	}

briar-android/src/main/java/org/briarproject/briar/android/StartupFailureActivity.java

@@ -1,6 +1,5 @@
 package org.briarproject.briar.android;
 
-import android.app.NotificationManager;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -15,9 +14,7 @@ import org.briarproject.briar.android.fragment.ErrorFragment;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.bramble.api.lifecycle.LifecycleManager.StartResult;
-import static org.briarproject.briar.android.BriarService.EXTRA_NOTIFICATION_ID;
 import static org.briarproject.briar.android.BriarService.EXTRA_START_RESULT;
 
 @MethodsNotNullByDefault
@@ -41,14 +38,6 @@ public class StartupFailureActivity extends BaseActivity implements
 	private void handleIntent(Intent i) {
 		StartResult result =
 				(StartResult) i.getSerializableExtra(EXTRA_START_RESULT);
-		int notificationId = i.getIntExtra(EXTRA_NOTIFICATION_ID, -1);
-
-		// cancel notification
-		if (notificationId > -1) {
-			Object o = getSystemService(NOTIFICATION_SERVICE);
-			NotificationManager nm = (NotificationManager) requireNonNull(o);
-			nm.cancel(notificationId);
-		}
 
 		// show proper error message
 		int errorRes;
@@ -78,5 +67,4 @@ public class StartupFailureActivity extends BaseActivity implements
 	public void runOnDbThread(@NonNull Runnable runnable) {
 		throw new UnsupportedOperationException();
 	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/navdrawer/NavDrawerActivity.java

@@ -29,6 +29,7 @@ import org.briarproject.bramble.api.plugin.TorConstants;
 import org.briarproject.bramble.api.plugin.TransportId;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.BriarApplication;
+import org.briarproject.briar.android.StartupFailureActivity;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
 import org.briarproject.briar.android.blog.FeedFragment;
@@ -73,6 +74,7 @@ import static org.briarproject.bramble.api.plugin.Plugin.State.ACTIVE;
 import static org.briarproject.bramble.api.plugin.Plugin.State.ENABLING;
 import static org.briarproject.bramble.api.plugin.Plugin.State.STARTING_STOPPING;
 import static org.briarproject.briar.android.BriarService.EXTRA_STARTUP_FAILED;
+import static org.briarproject.briar.android.BriarService.EXTRA_START_RESULT;
 import static org.briarproject.briar.android.TestingConstants.IS_DEBUG_BUILD;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_PASSWORD;
 import static org.briarproject.briar.android.navdrawer.IntentRouter.handleExternalIntent;
@@ -250,6 +252,11 @@ public class NavDrawerActivity extends BriarActivity implements
 
 	private void exitIfStartupFailed(Intent intent) {
 		if (intent.getBooleanExtra(EXTRA_STARTUP_FAILED, false)) {
+			// Launch StartupFailureActivity in its own process, then exit
+			Intent i = new Intent(this, StartupFailureActivity.class);
+			i.putExtra(EXTRA_START_RESULT,
+					intent.getSerializableExtra(EXTRA_START_RESULT));
+			startActivity(i);
 			finish();
 			LOG.info("Exiting");
 			System.exit(0);

briar-android/src/main/java/org/briarproject/briar/api/android/AndroidNotificationManager.java

@@ -41,8 +41,10 @@ public interface AndroidNotificationManager {
 	// that will sort below the main channels such as contacts
 	String ONGOING_CHANNEL_OLD_ID = "zForegroundService";
 	String ONGOING_CHANNEL_ID = "zForegroundService2";
-	String FAILURE_CHANNEL_ID = "zStartupFailure";
 	String REMINDER_CHANNEL_ID = "zSignInReminder";
+	// This channel is no longer used - keep the ID so we can remove the
+	// channel from existing installations
+	String FAILURE_CHANNEL_ID = "zStartupFailure";
 
 	// Actions for pending intents
 	String ACTION_DISMISS_REMINDER = "dismissReminder";