phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use reloadIITC() if mReloadNeeded == true

Browse Source
This commit is contained in:
fkloft 2013-09-18 16:29:10 +02:00
parent eee9ce78e0
commit 6290ef56aa
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -99,8 +99,7 @@ public class IITC_Mobile extends Activity {
mActionBarHelper = new ActionBarHelper(this, super.getActionBar()); mActionBarHelper = new ActionBarHelper(this, super.getActionBar());
// do something if user changed something in the settings // do something if user changed something in the settings
mSharedPrefs = PreferenceManager mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
.getDefaultSharedPreferences(this);
mSharedPrefChangeListener = new OnSharedPreferenceChangeListener() { mSharedPrefChangeListener = new OnSharedPreferenceChangeListener() {
@Override @Override
public void onSharedPreferenceChanged( public void onSharedPreferenceChanged(
@ -289,23 +288,21 @@ public class IITC_Mobile extends Activity {
// enough idle...let's do some work // enough idle...let's do some work
Log.d("iitcm", "resuming...reset idleTimer"); Log.d("iitcm", "resuming...reset idleTimer");
mIitcWebView.loadUrl("javascript: window.idleReset();");
mIitcWebView.updateCaching(); mIitcWebView.updateCaching();
if (mIsLocEnabled) { if (mIsLocEnabled) {
// Register the mSharedPrefChangeListener with the Location Manager to receive // Register the mSharedPrefChangeListener with the Location Manager to receive
// location updates // location updates
mLocMngr.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, mLocMngr.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, mLocListener);
0, 0, mLocListener); mLocMngr.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, mLocListener);
mLocMngr.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0,
mLocListener);
} }
if (mReloadNeeded) { if (mReloadNeeded) {
Log.d("iitcm", "preference had changed...reload needed"); Log.d("iitcm", "preference had changed...reload needed");
this.loadUrl(mIntelUrl); reloadIITC();
mReloadNeeded = false;
} }
else
mIitcWebView.loadUrl("javascript: window.idleReset();");
} }
@Override @Override
@ -499,7 +496,8 @@ public class IITC_Mobile extends Activity {
mBackStack.clear(); mBackStack.clear();
// iitc starts on map after reload // iitc starts on map after reload
mCurrentPane = android.R.id.home; mCurrentPane = android.R.id.home;
this.loadUrl(mIntelUrl); loadUrl(mIntelUrl);
mReloadNeeded = false;
} }
private void loadIITC() { private void loadIITC() {