bug fix: ASAPApplication.getASAPApplication stabilized

Author: thsc42

app/src/main/java/net/sharksystem/asap/android/apps/ASAPApplication.java

@@ -97,6 +97,9 @@ protected ASAPApplication(Collection<CharSequence> supportedFormats,
         this.rootFolder = rootFolder;
         this.onlineExchange = onlineExchange;
 
+        // remember me
+        ASAPApplication.singleton = this;
+
         // set context
         this.setActivity(initialActivity);
 
@@ -248,6 +251,10 @@ public static ASAPApplication getASAPApplication() {
         return ASAPApplication.singleton;
     }
 
+    public static boolean asapApplicationInitialized() {
+        return ASAPApplication.singleton != null;
+    }
+
     /**
      * Factory method: Setup an asap application. See documentation in the wiki. Don't forget
      * to launch you application by calling startApplication afterwards.

app/src/main/java/net/sharksystem/asap/android/example/ASAPExampleApplication.java

@@ -12,6 +12,8 @@
 public class ASAPExampleApplication extends ASAPApplication {
     public static final String ASAP_EXAMPLE_APPNAME = "ASAP_EXAMPLE_APP";
     private CharSequence id;
+
+    /*
     static ASAPExampleApplication instance = null;
 
     public static ASAPExampleApplication getASAPApplication() {
@@ -21,22 +23,25 @@ public static ASAPExampleApplication getASAPApplication() {
 
         return ASAPExampleApplication.instance;
     }
+     */
 
     static ASAPExampleApplication initializeASAPExampleApplication(Activity initialActivity) {
-        if(ASAPExampleApplication.instance == null) {
+//        if(ASAPExampleApplication.instance == null) {
+        if(!ASAPApplication.asapApplicationInitialized()) {
             Collection<CharSequence> formats = new ArrayList<>();
             formats.add(ASAP_EXAMPLE_APPNAME);
 
             // create
-            ASAPExampleApplication.instance = new ASAPExampleApplication(formats, initialActivity);
+            new ASAPExampleApplication(formats, initialActivity);
 
             // there could be some other steps. Setting up sub components. But there are non here.
 
             // launch
-            ASAPExampleApplication.instance.startASAPApplication();
+            ASAPApplication.getASAPApplication().startASAPApplication();
+//            ASAPExampleApplication.instance.startASAPApplication();
         } // else - already initialized - nothing happens.
 
-        return ASAPExampleApplication.instance;
+        return (ASAPExampleApplication) ASAPApplication.getASAPApplication();
     }
 
     private ASAPExampleApplication(Collection<CharSequence> formats, Activity initialActivity) {