X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2FCampusApp.java;h=719d8297de7f21498f58eac011adf7bf844441f5;hb=cea4ee15ef92f521ae962404bd1b3c25042219fa;hp=f201da69cf985fb61e91848b133bf65aeb68fa16;hpb=60b04973e203241d319e2d8ee6c150d641b02a65;p=DHBWCampusApp.git

diff --git a/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java b/app/src/main/java/de/dhbwloe/campusapp/CampusApp.java
index f201da6..719d829 100644
--- 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() {
@@ -149,8 +152,10 @@ public class CampusApp extends FragmentActivity {
                         AppContext.getNavigationManager().navigatePage("News");
                         break;
                     case R.id.nav_settings:
-                        Intent settings = new Intent(AppContext.getMainActivity(), SettingsActivity.class);
-                        AppContext.getMainActivity().startActivity(settings);
+                        AppContext.getNavigationManager().navigatePage("Settings");
+                        break;
+                    case R.id.nav_wifi:
+                        AppContext.getNavigationManager().navigatePage("WifiSettings");
                         break;
                     case R.id.nav_impressum:
                         AppContext.getNavigationManager().navigatePage("Impressum");
@@ -284,6 +289,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();