projects
/
DHBWCampusApp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alpha 0.0.2
[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..719d8297de7f21498f58eac011adf7bf844441f5 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");
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"));
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);
// Always call the superclass so it can save the view hierarchy state
super.onSaveInstanceState(savedInstanceState);
+
+ AppContext = null; // simulate GC
}
public void prepareMainUi() {
}
public void prepareMainUi() {
@@
-149,8
+152,10
@@
public class CampusApp extends FragmentActivity {
AppContext.getNavigationManager().navigatePage("News");
break;
case R.id.nav_settings:
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");
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() {
/* 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();
super.onResume();
Log.i("CampusApp", "onResume event");
AppContext.getNfcCardListener().resumeForefrontDispatcher();