Fixed restarting service registry and cleaning event listeners

igrek51 · Oct 19, 2016 · 630a9dc · 630a9dc
1 parent 699c54c
commit 630a9dc
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/java/igrek/songbook/logger/Logs.java b/app/src/main/java/igrek/songbook/logger/Logs.java
@@ -15,7 +15,7 @@ public class Logs {
 
     private static final String LOG_TAG = "ylog";
     private static final boolean SHOW_EXCEPTIONS_TRACE = true;
-    private static final LogLevel SHOW_TRACE_DETAILS_LEVEL = LogLevel.TRACE;
+    private static final LogLevel SHOW_TRACE_DETAILS_LEVEL = LogLevel.DEBUG;
 
     private static List<String> echoes;
     private static int errors = 0;

diff --git a/app/src/main/java/igrek/songbook/logic/app/BaseApp.java b/app/src/main/java/igrek/songbook/logic/app/BaseApp.java
@@ -9,6 +9,7 @@
 import android.view.WindowManager;
 
 import igrek.songbook.logger.Logs;
+import igrek.songbook.logic.controller.AppController;
 
 public abstract class BaseApp {
 
@@ -26,6 +27,9 @@ public abstract class BaseApp {
     public BaseApp(AppCompatActivity aActivity) {
         this.activity = aActivity;
 
+        // WYCZYSZCZENIE REJESTRU USŁUG I LISTENERÓW EVENTÓW
+        new AppController();
+
         //łapanie niezłapanych wyjątków
         defaultUEH = Thread.getDefaultUncaughtExceptionHandler();
         Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {

diff --git a/app/src/main/java/igrek/songbook/logic/controller/AppController.java b/app/src/main/java/igrek/songbook/logic/controller/AppController.java
@@ -14,6 +14,9 @@ public class AppController {
 
     private static AppController instance = null;
 
+    /**
+     * Reset instacji rejestru usług i wyczyszczenie listenerów eventów
+     */
     public AppController() {
         servicesRegistry = new ServicesRegistry();
         eventDispatcher = new EventDispatcher();

diff --git a/app/src/main/java/igrek/songbook/logic/filetree/FileTreeManager.java b/app/src/main/java/igrek/songbook/logic/filetree/FileTreeManager.java
@@ -14,7 +14,7 @@
 
 public class FileTreeManager {
 
-    private String currentPath;
+    private String currentPath = null;
     private String currentFileName = null;
 
     private List<FileItem> items;
@@ -23,6 +23,7 @@ public FileTreeManager(String startPath) {
 
         Filesystem filesystem = AppController.getService(Filesystem.class);
 
+        currentPath = null;
         setCurrentPathIfNotSet(filesystem, startPath);
         if (currentPath == null) {
             Logs.warn("not existing starting directory: " + startPath + ", getting default");

diff --git a/release/SongBook-1.2.32.apk b/release/SongBook-1.2.32.apk
diff --git a/release/SongBook-1.2.43.apk b/release/SongBook-1.2.43.apk
diff --git a/release/SongBook-db-1.2.32.zip → release/SongBook-db-1.2.43.zip b/release/SongBook-db-1.2.32.zip → release/SongBook-db-1.2.43.zip