From a300824400dac391bdcdd3d28eb84b803889731e Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Fri, 30 Mar 2018 19:30:09 +0200 Subject: [PATCH] Update minsdk version & analytics packages --- OsmAnd/AndroidManifest.xml | 5 +- OsmAnd/build.gradle | 14 ++--- OsmAnd/google-services.json | 55 ++++++++++++++++++- .../src/net/osmand/plus/AppInitializer.java | 5 +- 4 files changed, 67 insertions(+), 12 deletions(-) diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml index 7986405e54..b7237fd462 100644 --- a/OsmAnd/AndroidManifest.xml +++ b/OsmAnd/AndroidManifest.xml @@ -39,8 +39,9 @@ - + + diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index a3cd3d213c..58ecc319d8 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -47,12 +47,12 @@ android { } defaultConfig { - minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14 + minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 15 targetSdkVersion 23 versionCode 300 versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode multiDexEnabled true - versionName "2.9.0" + versionName "3.0.0" versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName versionName System.getenv("APK_VERSION_SUFFIX")? versionName + System.getenv("APK_VERSION_SUFFIX").toString(): versionName } @@ -384,13 +384,13 @@ repositories { } def analytics = (System.getenv("APP_FEATURES") && System.getenv("APP_FEATURES").contains("+play_market") && - System.getenv("PACKAGE_TO_BUILT").equals("net.osmand") ) || System.getenv("USE_FIREBASE") + ["net.osmand", "net.osmand.dev"].contains(System.getenv("PACKAGE_TO_BUILT")) ) || System.getenv("USE_FIREBASE") dependencies { compile project(path: ':OsmAnd-java', configuration: 'android') if (analytics) { - compile 'com.google.firebase:firebase-core:9.8.0' - compile 'com.google.firebase:firebase-config:9.8.0' - implementation 'com.facebook.android:facebook-android-sdk:[4,5)' + compile 'com.google.firebase:firebase-core:12.0.1' + compile 'com.google.firebase:firebase-config:12.0.1' + compile 'com.facebook.android:facebook-android-sdk:[4,5)' } compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:gridlayout-v7:27.1.0' @@ -399,7 +399,7 @@ dependencies { compile 'com.android.support:design:27.1.0' compile 'com.android.support:customtabs:27.1.0' compile fileTree(include: ['bsh-core-2.0b4.jar', 'bzip2-20090327.jar', 'gnu-trove-osmand.jar', 'gson-2.5.jar', 'icu4j-49_1_patched.jar', 'jts-core-1.14.0.jar', 'junidecode-0.1.jar', 'simple-logging.jar', 'tuprolog.jar'], dir: 'libs') - + legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar" qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar" qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar" diff --git a/OsmAnd/google-services.json b/OsmAnd/google-services.json index 6f57944314..a38df8478a 100644 --- a/OsmAnd/google-services.json +++ b/OsmAnd/google-services.json @@ -5,6 +5,7 @@ "project_id": "osmand-1e236", "storage_bucket": "osmand-1e236.appspot.com" }, + "client": [ { "client_info": { @@ -13,6 +14,58 @@ "package_name": "net.osmand" } }, + "oauth_client": [ + { + "client_id": "521675454867-te1hdssotqq2dhu7pj2pjm17eulm1tvf.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "net.osmand", + "certificate_hash": "49a9ace0bfee7bb91506d7921f93a47808cb62ab" + } + }, + { + "client_id": "521675454867-ttjur3617a74qj0a9rkbkbcjavvuebjp.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyBMaRMiPY-mS3J_-aX30sRBFB-WGIm-M-U" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "521675454867-ta1aisohg7g0k542gdh9fbeb2v4qsncf.apps.googleusercontent.com", + "client_type": 2, + "ios_info": { + "bundle_id": "net.osmand.maps", + "app_store_id": "934850257" + } + }, + { + "client_id": "521675454867-ttjur3617a74qj0a9rkbkbcjavvuebjp.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:521675454867:android:47aa2619f9a3dda7", + "android_client_info": { + "package_name": "net.osmand.dev" + } + }, "oauth_client": [ { "client_id": "521675454867-ttjur3617a74qj0a9rkbkbcjavvuebjp.apps.googleusercontent.com", @@ -36,7 +89,7 @@ "status": 2 } } - } + }, ], "configuration_version": "1" } \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java index 56f92ede64..e278b39a3c 100644 --- a/OsmAnd/src/net/osmand/plus/AppInitializer.java +++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java @@ -13,7 +13,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Build; import android.support.v7.app.AlertDialog; - +import android.util.Log; import net.osmand.IProgress; import net.osmand.IndexConstants; import net.osmand.PlatformUtil; @@ -66,7 +66,6 @@ import java.util.Locale; import java.util.Random; import btools.routingapp.BRouterServiceConnection; - import static net.osmand.plus.liveupdates.LiveUpdatesHelper.getPendingIntent; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.preferenceLastCheck; import static net.osmand.plus.liveupdates.LiveUpdatesHelper.preferenceLiveUpdatesOn; @@ -609,6 +608,8 @@ public class AppInitializer implements IProgress { notifyEvent(InitEvents.RESTORE_BACKUPS); app.mapMarkersHelper.syncAllGroupsAsync(); app.searchUICore.initSearchUICore(); + + /// Log.i("Firebase token", com.google.firebase.iid.FirebaseInstanceId.getInstance().getToken()); checkLiveUpdatesAlerts(); } catch (RuntimeException e) {