added launcher icon, fixed crash due to AppContext = null (damn Android GC), made...

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / CampusApp.java

diff --git a/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java b/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java
index f201da69cf985fb61e91848b133bf65aeb68fa16..15ae6dcbf70953fa34154e87808d9418082ae6da 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java
@@ -63,11 +63,12 @@ public class CampusApp extends FragmentActivity {
         boolean instantRestore = false;
         if(savedInstanceState != null) {
             long lastrun = savedInstanceState.getLong("lastrun");
-            if(((new Date()).getTime()/1000) - lastrun < 30) {
+            lastrun = ((new Date()).getTime()/1000) - lastrun;
+            Log.i("CampusApp", "Restored from Idle state! Idled: "+lastrun+" secs");
+            if(lastrun < 30) {
                 instantRestore = true;
 
                 AppContext.setTitle(savedInstanceState.getString("activetitle"));
-
             }
 
 
@@ -103,6 +104,8 @@ public class CampusApp extends FragmentActivity {
 
         // Always call the superclass so it can save the view hierarchy state
         super.onSaveInstanceState(savedInstanceState);
+
+        AppContext = null; // simulate GC
     }
 
     public void prepareMainUi() {
@@ -284,6 +287,11 @@ public class CampusApp extends FragmentActivity {
     /* nfc listener related callbacks */
     @Override
     public void onResume() {
+        if(AppContext == null)
+            AppContext = new CampusAppContext(this, R.id.fragment_container);
+        else
+            AppContext.setMainActivity(this);
+
         super.onResume();
         Log.i("CampusApp", "onResume event");
         AppContext.getNfcCardListener().resumeForefrontDispatcher();