MERGE

1 files changed, 4 insertions, 28 deletions

diff --git a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java b/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java
index 3937735cf..69e4c7b22 100644
--- a/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java
+++ b/Software/Android_Studio/Tango.Stubs.UI/src/main/java/com/twine/tango/stubs/ui/App.java
@@ -15,6 +15,7 @@ import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator;
 import com.google.protobuf.GeneratedMessageV3;
 import com.twine.tango.core.ContextFactory;
 import com.twine.tango.dal.TangoDB;
+import com.twine.tango.sharedui.AppInitializer;
 import com.twine.tango.stubs.ui.dagger.ApplicationComponent;
 import com.twine.tango.stubs.ui.dagger.ApplicationModule;
 import com.twine.tango.stubs.ui.dagger.DaggerApplicationComponent;
@@ -43,42 +44,17 @@ public class App extends Application {
     @Override
     public File getDatabasePath(String name)
     {
-        return TangoDB.getDataBasePath(name);
+        return new File(TangoDB.getDataBasePath());
     }
     
     @Override
     public void onCreate() {
         super.onCreate();
-
-        JodaTimeAndroid.init(this);
-
+        
         appComponent = initDagger(this);
         context = getApplicationContext();
     
-        ContextFactory.init(context);
-
-        LogConfiguration config = new LogConfiguration.Builder()
-                .logLevel(LogLevel.ALL)
-                .tag("Tango")
-                .t()
-                .st(1)
-//                .b()
-                .addObjectFormatter(GeneratedMessageV3.class, msg -> msg.toString()).build();
-
-        File sdcard = context.getFilesDir();
-        File dir = new File(sdcard.getAbsolutePath() + "/logs");
-        boolean b = dir.mkdirs();
-
-        Printer androidPrinter = new AndroidPrinter();
-        Printer filePrinter = new FilePrinter.Builder(dir.getPath())
-                .fileNameGenerator(new DateFileNameGenerator())
-                .backupStrategy(new FileSizeBackupStrategy(1024 * 1024))
-                .build();
-
-        XLog.init(config, androidPrinter, filePrinter);
-        XLog.i("Logger Initialized. logs will be saved to: " + dir.getAbsolutePath());
-
-        TangoDB.init();
+        AppInitializer.init(context);
 
         Thread.setDefaultUncaughtExceptionHandler((thread, throwable) -> {