diff --git a/mobile/AndroidManifest.xml b/mobile/AndroidManifest.xml index 57c7693b..1ae9ff11 100644 --- a/mobile/AndroidManifest.xml +++ b/mobile/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="41" + android:versionName="0.5.7"> breunigs. After Niantic asked the main developer to shut down his github project, development is continued on a fork of jonatkins.

- Website:
- http://iitc.jonatkins.com/

- IITC on Github:
- https://github.com/jonatkins/ingress-intel-total-conversion]]> + Community:
+ • Visit the IITC website for new releases and the desktop version.
+ • Follow the IITC Google+ page + for release announcements.
+ • Join the IITC Google+ community + - a place to ask for help and discuss with other users.

+ Developers:
+ IITC on Github

+ Licence:
+ Copyright © 2013 Stefan Breunig, Philipp Schäfer, Jon Atkins and others

+ + Permission to use, copy, modify, and/or distribute this software for + any purpose with or without fee is hereby granted, provided that the + above copyright notice and this permission notice appear in all + copies.

+ + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL + WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE + AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA + OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE.]]> UI diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java index 330d7955..908ad25f 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java @@ -13,6 +13,8 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.DialogInterface.OnMultiChoiceClickListener; import android.content.Intent; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.util.Log; import android.view.View; import android.webkit.JavascriptInterface; @@ -79,6 +81,19 @@ public class IITC_JSInterface { .show(); } + @JavascriptInterface + public int getVersionCode() { + int versionCode = 0; + try { + PackageInfo pInfo = mContext.getPackageManager() + .getPackageInfo(mContext.getPackageName(), 0); + versionCode = pInfo.versionCode; + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return versionCode; + } + @JavascriptInterface public void switchToPane(String id) { diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java index 8a624ca5..f086d8fd 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java @@ -475,7 +475,7 @@ public class IITC_Mobile extends Activity { if (!mIsLocEnabled) { mIitcWebView.loadUrl("javascript: " + "window.map.locate({setView : true, maxZoom: 15});"); - // if gps location is displayed we can use a better location without any costs + // if gps location is displayed we can use a better location without any costs } else { if (mLastLocation != null) mIitcWebView.loadUrl("javascript: window.map.setView(new L.LatLng(" + @@ -554,9 +554,12 @@ public class IITC_Mobile extends Activity { // throw away all positions with accuracy > 100 meters // should avoid gps glitches if (loc.getAccuracy() < 100) { - mIitcWebView.loadUrl("javascript: " - + "window.plugin.userLocation.updateLocation( " - + loc.getLatitude() + ", " + loc.getLongitude() + ");"); + // do not touch the javascript while iitc boots + if (findViewById(R.id.imageLoading).getVisibility() == View.GONE) { + mIitcWebView.loadUrl("javascript: " + + "window.plugin.userLocation.updateLocation( " + + loc.getLatitude() + ", " + loc.getLongitude() + ");"); + } } } diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java index 756d6b64..1bcf0b1f 100644 --- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java +++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java @@ -79,19 +79,13 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList // we merge gmaps intents with geo intents since it is not possible // anymore to set a labeled marker on geo intents ArrayList intents = new ArrayList(); - DecimalFormatSymbols decFormat = new DecimalFormatSymbols(); - // thx to gmaps, this only works for the decimal point separator String gMapsUri; - if (decFormat.getDecimalSeparator() == '.') - try { - gMapsUri = "http://maps.google.com/maps?q=loc:" + mLl + - "%20(" + URLEncoder.encode(mTitle, "UTF-8") + ")&z=" + mZoom; - } catch (UnsupportedEncodingException e) { - gMapsUri = "http://maps.google.com/maps?ll=" + mLl + "&z=" + mZoom; - e.printStackTrace(); - } - else - gMapsUri = "http://maps.google.com/maps?ll=" + mLl + "&z=" + mZoom; + try { + gMapsUri = "http://maps.google.com/?daddr=" + mLl + "%20(" + URLEncoder.encode(mTitle, "UTF-8") + ")"; + } catch (UnsupportedEncodingException e) { + gMapsUri = "http://maps.google.com/?daddr=" + mLl; + e.printStackTrace(); + } Intent gMapsIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(gMapsUri)); intents.add(gMapsIntent); String geoUri = "geo:" + mLl; diff --git a/website/page/about.php b/website/page/about.php index 7c06c41f..25f54b1b 100644 --- a/website/page/about.php +++ b/website/page/about.php @@ -31,10 +31,10 @@ any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL +AUTHORS BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR