Update minsdk version & analytics packages

OsmAnd/AndroidManifest.xml

@@ -39,8 +39,9 @@
 	<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
 	<uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/>
 
-	<uses-sdk android:targetSdkVersion="21" android:minSdkVersion="9"
+<!-- com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs -->
-		tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/>
+	<uses-sdk android:targetSdkVersion="23" android:minSdkVersion="15"
+		tools:overrideLibrary=""/>
 
 	<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
 		android:xlargeScreens="true" android:anyDensity="true" />

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-core:12.0.1'
-		compile 'com.google.firebase:firebase-config:9.8.0'
+		compile 'com.google.firebase:firebase-config:12.0.1'
-		implementation 'com.facebook.android:facebook-android-sdk:[4,5)'
+		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'

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"
 }

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) {