aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2015-04-28 23:04:34 +0200
committerBananeweizen <bananeweizen@gmx.de>2015-04-28 23:04:34 +0200
commit5b31d444608dd2cf5b5a8bc43aef65a1c532c605 (patch)
tree4edc48b99452dc7767c5cf65c2982d0e8dba698e
parent1e41522dc8ae020c5b157b16aaeb86a174558886 (diff)
downloadcgeo-5b31d444608dd2cf5b5a8bc43aef65a1c532c605.zip
cgeo-5b31d444608dd2cf5b5a8bc43aef65a1c532c605.tar.gz
cgeo-5b31d444608dd2cf5b5a8bc43aef65a1c532c605.tar.bz2
upgrade to Play Services 7.3
-rw-r--r--main/src/cgeo/geocaching/CgeoApplication.java4
-rw-r--r--play-services-base/libs/play-services-base.jarbin560002 -> 640673 bytes
-rw-r--r--play-services-base/res/values/common_strings.xml2
-rw-r--r--play-services-base/res/values/version.xml2
-rw-r--r--play-services-location/libs/play-services-location.jarbin207263 -> 221217 bytes
5 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/CgeoApplication.java b/main/src/cgeo/geocaching/CgeoApplication.java
index 32a99f0..72c9f5c 100644
--- a/main/src/cgeo/geocaching/CgeoApplication.java
+++ b/main/src/cgeo/geocaching/CgeoApplication.java
@@ -7,7 +7,7 @@ import cgeo.geocaching.utils.OOMDumpingUncaughtExceptionHandler;
import cgeo.geocaching.utils.RxUtils;
import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GooglePlayServicesUtil;
+import com.google.android.gms.common.GoogleApiAvailability;
import org.eclipse.jdt.annotation.NonNull;
@@ -76,7 +76,7 @@ public class CgeoApplication extends Application {
DataStore.getLists();
// Check if Google Play services is available
- if (GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS) {
+ if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS) {
isGooglePlayServicesAvailable = true;
}
Log.i("Google Play services are " + (isGooglePlayServicesAvailable ? "" : "not ") + "available");
diff --git a/play-services-base/libs/play-services-base.jar b/play-services-base/libs/play-services-base.jar
index 1cbc396..df407a7 100644
--- a/play-services-base/libs/play-services-base.jar
+++ b/play-services-base/libs/play-services-base.jar
Binary files differ
diff --git a/play-services-base/res/values/common_strings.xml b/play-services-base/res/values/common_strings.xml
index 135e4b2..19e18ac 100644
--- a/play-services-base/res/values/common_strings.xml
+++ b/play-services-base/res/values/common_strings.xml
@@ -49,7 +49,7 @@
<!-- Title of confirmation dialog informing user that they need to update
Google Play services (from Play Store) [CHAR LIMIT=40] -->
<string name="common_google_play_services_update_title" msgid="6006316683626838685">Update Google Play services</string>
-
+
<!-- Title of confirmation dialog informing user that they need to update
the Android Wear app (from Play Store) [CHAR LIMIT=40] -->
<string name="common_android_wear_update_title" msgid="6006316683626838685">Update Android Wear</string>
diff --git a/play-services-base/res/values/version.xml b/play-services-base/res/values/version.xml
index 151b1d6..1af3c0a 100644
--- a/play-services-base/res/values/version.xml
+++ b/play-services-base/res/values/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <integer name="google_play_services_version">7095000</integer>
+ <integer name="google_play_services_version">7327000</integer>
</resources> \ No newline at end of file
diff --git a/play-services-location/libs/play-services-location.jar b/play-services-location/libs/play-services-location.jar
index 1b2ea9f..1f59e22 100644
--- a/play-services-location/libs/play-services-location.jar
+++ b/play-services-location/libs/play-services-location.jar
Binary files differ