diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index 2d9f8d78..eca04943 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -7,9 +7,9 @@ - + - + - + \ No newline at end of file diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index 3e64f216..61a02499 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -15,26 +15,26 @@ import android.widget.Toast; public class IITC_Mobile extends Activity { private IITC_WebView iitc_view; - private boolean back_button_pressed = false; + private boolean back_button_pressed = false; - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); - // we do not want to reload our page every time we switch orientations... - // so restore state if activity was already created - if(savedInstanceState != null) { - ((IITC_WebView)findViewById(R.id.webview)).restoreState(savedInstanceState); - } - else { - // load new iitc web view with ingress intel page - iitc_view= (IITC_WebView) findViewById(R.id.webview); - iitc_view.setWebChromeClient(new WebChromeClient()); - iitc_view.loadUrl("https://www.ingress.com/intel"); + // we do not want to reload our page every time we switch orientations... + // so restore state if activity was already created + if(savedInstanceState != null) { + ((IITC_WebView)findViewById(R.id.webview)).restoreState(savedInstanceState); + } + else { + // load new iitc web view with ingress intel page + iitc_view= (IITC_WebView) findViewById(R.id.webview); + iitc_view.setWebChromeClient(new WebChromeClient()); + iitc_view.loadUrl("https://www.ingress.com/intel"); - // listen to touches (think we need this) - iitc_view.setOnTouchListener(new OnTouchListener() { + // listen to touches (think we need this) + iitc_view.setOnTouchListener(new OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { back_button_pressed = false; @@ -43,50 +43,49 @@ public class IITC_Mobile extends Activity { return false; } }); - } + } + } - } + // save instance state to avoid reloading on orientation change + @Override + protected void onSaveInstanceState(Bundle outState) { + iitc_view.saveState(outState); + } - // save instance state to avoid reloading on orientation change - @Override - protected void onSaveInstanceState(Bundle outState) { - iitc_view.saveState(outState); - } + // we want a self defined behavior on resume + @Override + protected void onResume() { + super.onResume(); + this.back_button_pressed = false; + } - // we want a self defined behavior on resume - @Override - protected void onResume() { - super.onResume(); - this.back_button_pressed = false; - } + // we want a self defined behavior for the back button + @Override + public void onBackPressed() { + if (this.back_button_pressed) { + super.onBackPressed(); + return; + } + this.back_button_pressed = true; + Toast.makeText(this, "Press twice to exit", Toast.LENGTH_SHORT).show(); + } - // we want a self defined behavior for the back button - @Override - public void onBackPressed() { - if (this.back_button_pressed) { - super.onBackPressed(); - return; - } - this.back_button_pressed = true; - Toast.makeText(this, "Press twice to exit", Toast.LENGTH_SHORT).show(); - } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main, menu); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle item selection - switch (item.getItemId()) { - case R.id.reload_button: - iitc_view.reload(); - return true; - default: - return super.onOptionsItemSelected(item); - } - } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle item selection + switch (item.getItemId()) { + case R.id.reload_button: + iitc_view.reload(); + return true; + default: + return super.onOptionsItemSelected(item); + } + } } diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java index fcf4eb80..d82ca25b 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java @@ -11,7 +11,7 @@ public class IITC_WebView extends WebView { private WebSettings settings; private IITC_WebViewClient webclient; - + // init web view private void iitc_init() { settings = this.getSettings(); @@ -22,7 +22,7 @@ public class IITC_WebView extends WebView { webclient = new IITC_WebViewClient(); this.setWebViewClient(webclient); } - + // constructors ------------------------------------------------- public IITC_WebView(Context context) { super(context); @@ -35,7 +35,7 @@ public class IITC_WebView extends WebView { iitc_init(); } - + public IITC_WebView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java index c984e2dc..d36180ed 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java @@ -25,12 +25,12 @@ public class IITC_WebViewClient extends WebViewClient { CookieManager cm = CookieManager.getInstance(); final String cookie = cm.getCookie("https://www.ingress.com/intel"); if(cookie != null) { - web.loadUrl("javascript: (function() { " - + "var script=document.createElement('script');" - + "script.type='text/javascript';" - + "script.src='https://iitcserv.appspot.com/iitc-nightly/iitc-nightly-latest.user.js';" - + "document.getElementsByTagName('head').item(0).appendChild(script);" - + "})()"); + web.loadUrl("javascript: (function() { " + + "var script=document.createElement('script');" + + "script.type='text/javascript';" + + "script.src='https://iitcserv.appspot.com/iitc-nightly/iitc-nightly-latest.user.js';" + + "document.getElementsByTagName('head').item(0).appendChild(script);" + + "})()"); } } }