From 88852de283a4262c54addd64766ef1c7f7fefe20 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 6 Apr 2016 17:02:56 +0100
Subject: [PATCH] Renamed AndroidModule to AppModule.
---
.../src/org/briarproject/android/AndroidComponent.java | 4 ++--
.../src/org/briarproject/android/AndroidEagerSingletons.java | 2 +-
.../android/{AndroidModule.java => AppModule.java} | 4 ++--
.../src/org/briarproject/android/BriarApplication.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
rename briar-android/src/org/briarproject/android/{AndroidModule.java => AppModule.java} (96%)
diff --git a/briar-android/src/org/briarproject/android/AndroidComponent.java b/briar-android/src/org/briarproject/android/AndroidComponent.java
index e6bb729544..4b3caa9967 100644
--- a/briar-android/src/org/briarproject/android/AndroidComponent.java
+++ b/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);
}
diff --git a/briar-android/src/org/briarproject/android/AndroidEagerSingletons.java b/briar-android/src/org/briarproject/android/AndroidEagerSingletons.java
index b14a785933..4a6cc4046d 100644
--- a/briar-android/src/org/briarproject/android/AndroidEagerSingletons.java
+++ b/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());
}
}
diff --git a/briar-android/src/org/briarproject/android/AndroidModule.java b/briar-android/src/org/briarproject/android/AppModule.java
similarity index 96%
rename from briar-android/src/org/briarproject/android/AndroidModule.java
rename to briar-android/src/org/briarproject/android/AppModule.java
index c985d311ca..066b0d1085 100644
--- a/briar-android/src/org/briarproject/android/AndroidModule.java
+++ b/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() {
diff --git a/briar-android/src/org/briarproject/android/BriarApplication.java b/briar-android/src/org/briarproject/android/BriarApplication.java
index dcf469ac78..dd32ded38e 100644
--- a/briar-android/src/org/briarproject/android/BriarApplication.java
+++ b/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
--
GitLab