Renamed AndroidModule to AppModule.

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

@@ -28,7 +28,7 @@ import dagger.Component;
 @Singleton
 @Component(modules = {
 		CoreModule.class,
-		AndroidModule.class,
+		AppModule.class,
 		AndroidPluginsModule.class,
 		AndroidSystemModule.class
 })
@@ -81,5 +81,5 @@ public interface AndroidComponent extends CoreEagerSingletons {
 	void inject(ShowQrCodeFragment fragment);
 
 	// Eager singleton load
-	void inject(AndroidModule.EagerSingletons init);
+	void inject(AppModule.EagerSingletons init);
 }

briar-android/src/org/briarproject/android/AndroidEagerSingletons.java

@@ -3,6 +3,6 @@ package org.briarproject.android;
 public class AndroidEagerSingletons {
 
 	public static void initEagerSingletons(AndroidComponent c) {
-		c.inject(new AndroidModule.EagerSingletons());
+		c.inject(new AppModule.EagerSingletons());
 	}
 }

briar-android/src/org/briarproject/android/AndroidModule.java → briar-android/src/org/briarproject/android/AppModule.java

@@ -21,7 +21,7 @@ import dagger.Provides;
 import static android.content.Context.MODE_PRIVATE;
 
 @Module
-public class AndroidModule {
+public class AppModule {
 
 	static class EagerSingletons {
 		@Inject
@@ -31,7 +31,7 @@ public class AndroidModule {
 	private final Application application;
 	private final UiCallback uiCallback;
 
-	public AndroidModule(Application application) {
+	public AppModule(Application application) {
 		this.application = application;
 		uiCallback = new UiCallback() {
 

briar-android/src/org/briarproject/android/BriarApplication.java

@@ -26,7 +26,7 @@ public class BriarApplication extends Application {
 		Thread.setDefaultUncaughtExceptionHandler(newHandler);
 
 		applicationComponent = DaggerAndroidComponent.builder()
-				.androidModule(new AndroidModule(this))
+				.appModule(new AppModule(this))
 				.build();
 
 		// We need to load the eager singletons directly after making the