From 045279a265165beaaa81bb2b967983708f04feb5 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Fri, 24 May 2013 17:24:02 +0200 Subject: [PATCH] extended JSInterface to finish app via js (see #312) --- .../cradle/iitc_mobile/IITC_JSInterface.java | 7 +++++++ .../src/com/cradle/iitc_mobile/IITC_Mobile.java | 17 ----------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java index 8aff9177..e0dc6cff 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java @@ -64,6 +64,13 @@ public class IITC_JSInterface { .show(); } + // exit IITC Mobile + @JavascriptInterface + public void exitIITC() { + Log.d("iitcm","no back stack...finishing iitc"); + ((IITC_Mobile) context).finish(); + } + // get layers and list them in a dialog @JavascriptInterface public void setLayers(String base_layer, String overlay_layer) { diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index d98ca631..1f86fe77 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -17,7 +17,6 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; import android.os.Bundle; -import android.os.Handler; import android.os.StrictMode; import android.preference.PreferenceManager; import android.util.Log; @@ -34,7 +33,6 @@ public class IITC_Mobile extends Activity { private static final int REQUEST_LOGIN = 1; private IITC_WebView iitc_view; - private boolean back_button_pressed = false; private OnSharedPreferenceChangeListener listener; private String intel_url = "https://www.ingress.com/intel"; private boolean user_loc = false; @@ -236,22 +234,7 @@ public class IITC_Mobile extends Activity { this.toggleFullscreen(); return; } - if (this.back_button_pressed) { - super.onBackPressed(); - return; - } - iitc_view.loadUrl("javascript: window.goBack();"); - this.back_button_pressed = true; - Toast.makeText(this, "Press twice to exit", Toast.LENGTH_SHORT).show(); - - // reset back button after 0.5 seconds - new Handler().postDelayed(new Runnable() { - @Override - public void run() { - back_button_pressed = false; - } - }, 500); } @Override