diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index 93b9301b..1397c2c3 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -174,8 +174,6 @@ public class IITC_Mobile extends Activity { if (Intent.ACTION_VIEW.equals(action)) { Uri uri = intent.getData(); String url = uri.toString(); - if (intent.getScheme().equals("http")) - url = url.replace("http://", "https://"); Log.d("iitcm", "intent received url: " + url); if (url.contains("ingress.com")) { Log.d("iitcm", "loading url..."); diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java index 7da1058a..7522ce1d 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java @@ -37,7 +37,6 @@ public class IITC_WebView extends WebView { + "/databases/"); settings.setAppCachePath(this.getContext().getCacheDir() .getAbsolutePath()); - // use cache if on mobile network...saves traffic this.js_interface = new IITC_JSInterface(c); this.addJavascriptInterface(js_interface, "android"); @@ -132,6 +131,7 @@ public class IITC_WebView extends WebView { } public void updateCaching() { + // use cache if on mobile network...saves traffic if (!this.isConnectedToWifi()) { Log.d("iitcm", "not connected to wifi...load tiles from cache"); settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); diff --git a/mobile/user-location.user.js b/mobile/user-location.user.js index 0536412c..61aae0da 100644 --- a/mobile/user-location.user.js +++ b/mobile/user-location.user.js @@ -31,10 +31,21 @@ window.plugin.userLocation.setup = function() { iconRetinaUrl: iconRetImage }}); + var cssClass = PLAYER.team === 'ALIENS' ? 'enl' : 'res'; + var title = '' + PLAYER.nickname + '\'s location'; + var marker = L.marker(window.map.getCenter(), { - title: "User Location", + title: title, icon: new plugin.userLocation.icon() }); + + // copy location to android clipboard on marker click + marker.on('click', function(e) { + window.console.log('marker location'); + var ll = e.target.getLatLng(); + window.androidCopy('https://maps.google.com/?q='+ll.lat+','+ll.lng+'%20('+PLAYER.nickname+')'); + }); + plugin.userLocation.marker = marker; marker.addTo(window.map); // jQueryUI doesn’t automatically notice the new markers