Singletons that call registration methods must be eager.

bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidEagerSingletons.java

@@ -0,0 +1,11 @@
+package org.briarproject.bramble;
+
+import org.briarproject.bramble.battery.AndroidBatteryModule;
+import org.briarproject.bramble.network.AndroidNetworkModule;
+
+public interface BrambleAndroidEagerSingletons {
+
+	void inject(AndroidBatteryModule.EagerSingletons init);
+
+	void inject(AndroidNetworkModule.EagerSingletons init);
+}

bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java

@@ -15,4 +15,8 @@ import dagger.Module;
 })
 public class BrambleAndroidModule {
 
+	public static void initEagerSingletons(BrambleAndroidEagerSingletons c) {
+		c.inject(new AndroidBatteryModule.EagerSingletons());
+		c.inject(new AndroidNetworkModule.EagerSingletons());
+	}
 }

bramble-android/src/main/java/org/briarproject/bramble/battery/AndroidBatteryModule.java

@@ -3,6 +3,7 @@ package org.briarproject.bramble.battery;
 import org.briarproject.bramble.api.battery.BatteryManager;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 
+import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -11,6 +12,11 @@ import dagger.Provides;
 @Module
 public class AndroidBatteryModule {
 
+	public static class EagerSingletons {
+		@Inject
+		BatteryManager batteryManager;
+	}
+
 	@Provides
 	@Singleton
 	BatteryManager provideBatteryManager(LifecycleManager lifecycleManager,

bramble-android/src/main/java/org/briarproject/bramble/network/AndroidNetworkModule.java

@@ -3,6 +3,7 @@ package org.briarproject.bramble.network;
 import org.briarproject.bramble.api.lifecycle.LifecycleManager;
 import org.briarproject.bramble.api.network.NetworkManager;
 
+import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -11,6 +12,11 @@ import dagger.Provides;
 @Module
 public class AndroidNetworkModule {
 
+	public static class EagerSingletons {
+		@Inject
+		NetworkManager networkManager;
+	}
+
 	@Provides
 	@Singleton
 	NetworkManager provideNetworkManager(LifecycleManager lifecycleManager,

briar-android/src/androidTest/java/org/briarproject/briar/android/BriarTestComponentApplication.java

@@ -1,5 +1,6 @@
 package org.briarproject.briar.android;
 
+import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.briar.BriarCoreModule;
 
@@ -12,6 +13,7 @@ public class BriarTestComponentApplication extends BriarApplicationImpl {
 		// We need to load the eager singletons directly after making the
 		// dependency graphs
 		BrambleCoreModule.initEagerSingletons(component);
+		BrambleAndroidModule.initEagerSingletons(component);
 		BriarCoreModule.initEagerSingletons(component);
 		AndroidEagerSingletons.initEagerSingletons(component);
 		return component;

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

@@ -2,6 +2,7 @@ package org.briarproject.briar.android;
 
 import android.arch.lifecycle.ViewModelProvider;
 
+import org.briarproject.bramble.BrambleAndroidEagerSingletons;
 import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreEagerSingletons;
 import org.briarproject.bramble.BrambleCoreModule;
@@ -39,11 +40,11 @@ import org.briarproject.briar.api.blog.BlogManager;
 import org.briarproject.briar.api.blog.BlogPostFactory;
 import org.briarproject.briar.api.blog.BlogSharingManager;
 import org.briarproject.briar.api.client.MessageTracker;
+import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.feed.FeedManager;
 import org.briarproject.briar.api.forum.ForumManager;
 import org.briarproject.briar.api.forum.ForumSharingManager;
 import org.briarproject.briar.api.introduction.IntroductionManager;
-import org.briarproject.briar.api.conversation.ConversationManager;
 import org.briarproject.briar.api.messaging.MessagingManager;
 import org.briarproject.briar.api.messaging.PrivateMessageFactory;
 import org.briarproject.briar.api.privategroup.GroupMessageFactory;
@@ -68,7 +69,8 @@ import dagger.Component;
 		AppModule.class
 })
 public interface AndroidComponent
-		extends BrambleCoreEagerSingletons, BriarCoreEagerSingletons {
+		extends BrambleCoreEagerSingletons, BrambleAndroidEagerSingletons,
+		BriarCoreEagerSingletons {
 
 	// Exposed objects
 	@CryptoExecutor

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

@@ -66,10 +66,14 @@ public class AppModule {
 		@Inject
 		AndroidNotificationManager androidNotificationManager;
 		@Inject
+		ScreenFilterMonitor screenFilterMonitor;
+		@Inject
 		NetworkUsageLogger networkUsageLogger;
 		@Inject
 		DozeWatchdog dozeWatchdog;
 		@Inject
+		LockManager lockManager;
+		@Inject
 		RecentEmoji recentEmoji;
 	}
 

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

@@ -15,6 +15,7 @@ import com.vanniktech.emoji.google.GoogleEmojiProvider;
 import org.acra.ACRA;
 import org.acra.ReportingInteractionMode;
 import org.acra.annotation.ReportsCrashes;
+import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.briar.BriarCoreModule;
 import org.briarproject.briar.R;
@@ -124,6 +125,7 @@ public class BriarApplicationImpl extends Application
 		// We need to load the eager singletons directly after making the
 		// dependency graphs
 		BrambleCoreModule.initEagerSingletons(androidComponent);
+		BrambleAndroidModule.initEagerSingletons(androidComponent);
 		BriarCoreModule.initEagerSingletons(androidComponent);
 		AndroidEagerSingletons.initEagerSingletons(androidComponent);
 		return androidComponent;

briar-android/src/test/java/org/briarproject/briar/android/TestBriarApplication.java

@@ -7,6 +7,7 @@ import android.preference.PreferenceManager;
 import com.vanniktech.emoji.EmojiManager;
 import com.vanniktech.emoji.google.GoogleEmojiProvider;
 
+import org.briarproject.bramble.BrambleAndroidModule;
 import org.briarproject.bramble.BrambleCoreModule;
 import org.briarproject.briar.BriarCoreModule;
 
@@ -42,6 +43,7 @@ public class TestBriarApplication extends Application
 		// We need to load the eager singletons directly after making the
 		// dependency graphs
 		BrambleCoreModule.initEagerSingletons(applicationComponent);
+		BrambleAndroidModule.initEagerSingletons(applicationComponent);
 		BriarCoreModule.initEagerSingletons(applicationComponent);
 		AndroidEagerSingletons.initEagerSingletons(applicationComponent);
 		EmojiManager.install(new GoogleEmojiProvider());