From 62de50af76855cba1eac62a0b5e085acbcaccaf5 Mon Sep 17 00:00:00 2001 From: Torsten Grote <t@grobox.de> Date: Wed, 20 Jun 2018 15:29:28 -0300 Subject: [PATCH] Remind the user to sign in only when an account has been created --- .../briar/android/AndroidComponent.java | 2 ++ .../briarproject/briar/android/BootReceiver.java | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java index 02a5dc0ff7..778a6f2b95 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java @@ -150,6 +150,8 @@ public interface AndroidComponent @IoExecutor Executor ioExecutor(); + void inject(BootReceiver briarService); + void inject(BriarService briarService); void inject(BriarReportSender briarReportSender); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BootReceiver.java b/briar-android/src/main/java/org/briarproject/briar/android/BootReceiver.java index 20fed7c138..fa2a90ec9d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/BootReceiver.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/BootReceiver.java @@ -9,9 +9,12 @@ import android.content.Intent; import android.support.v4.app.NotificationCompat; import android.support.v4.content.ContextCompat; +import org.briarproject.bramble.api.db.DatabaseConfig; import org.briarproject.briar.R; import org.briarproject.briar.android.navdrawer.NavDrawerActivity; +import javax.inject.Inject; + import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.content.Context.NOTIFICATION_SERVICE; import static android.content.Intent.ACTION_BOOT_COMPLETED; @@ -25,11 +28,21 @@ import static org.briarproject.briar.api.android.AndroidNotificationManager.REMI public class BootReceiver extends BroadcastReceiver { + @Inject + DatabaseConfig databaseConfig; + @Override public void onReceive(Context ctx, Intent intent) { + AndroidComponent applicationComponent = + ((BriarApplication) ctx.getApplicationContext()) + .getApplicationComponent(); + applicationComponent.inject(this); + String action = intent.getAction(); if (action != null && action.equals(ACTION_BOOT_COMPLETED)) { - showSignInNotification(ctx); + if (databaseConfig.databaseExists()) { + showSignInNotification(ctx); + } } } -- GitLab