replace Telemetry service in Navigation service

baato · Mar 22, 2022 · add4651 · add4651
1 parent 3474203
commit add4651
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 48 deletions.
diff --git a/...roid-navigation-ui/build/.transforms/125c457756643b8f8323a3e49211cc12/classes/classes.dex b/...roid-navigation-ui/build/.transforms/125c457756643b8f8323a3e49211cc12/classes/classes.dex
diff --git a/libandroid-navigation-ui/build/intermediates/compile_library_classes_jar/debug/classes.jar b/libandroid-navigation-ui/build/intermediates/compile_library_classes_jar/debug/classes.jar
diff --git a/...ses/debug/out/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.class b/...ses/debug/out/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.class
diff --git a/...debug/classes/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.class b/...debug/classes/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.class
diff --git a/libandroid-navigation-ui/build/intermediates/runtime_library_classes_jar/debug/classes.jar b/libandroid-navigation-ui/build/intermediates/runtime_library_classes_jar/debug/classes.jar
diff --git a/.../src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java b/.../src/main/java/com/mapbox/services/android/navigation/ui/v5/route/NavigationMapRoute.java
@@ -303,7 +303,7 @@ public void addRoutes(@NonNull @Size(min = 1) List<DirectionsRoute> directionsRo
         alternativesVisible = directionsRoutes.size() > 1;
         generateFeatureCollectionList(directionsRoutes);
         drawRoutes();
-        addDirectionWaypoints();
+//        addDirectionWaypoints();
     }
 
     /**
@@ -456,7 +456,7 @@ private FeatureCollection waypointFeatureCollection(DirectionsRoute route) {
 
     private void addDirectionWaypoints() {
         Log.d(TAG, "addDirectionWaypoints: " + featureCollections.get(featureCollections.size() - 1));
-        if ((featureCollections.size() - 1) != 0) {
+        if (!featureCollections.isEmpty() && (featureCollections.size() - 1) != 0) {
             Log.d(TAG, "addDirectionWaypoints: no 0");
             MapUtils.updateMapSourceFromFeatureCollection(
                     mapboxMap, featureCollections.get(featureCollections.size() - 1), WAYPOINT_SOURCE_ID);

diff --git a/...igation/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/...igation/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.mapbox.services.android.navigation" >
 
     <uses-sdk
@@ -13,7 +12,7 @@
             android:foregroundServiceType="location" />
         <!-- Include the telemetry service to simplify set up (https://www.mapbox.com/telemetry) -->
         <service
-            android:name="com.mapbox.services.android.telemetry.service.TelemetryService"
+            android:name="com.mapbox.services.android.navigation.v5.navigation.telemetry.MapboxTelemetryService"
             android:foregroundServiceType="location" />
     </application>
 

diff --git a/libandroid-navigation/build/intermediates/library_manifest/debug/AndroidManifest.xml b/libandroid-navigation/build/intermediates/library_manifest/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.mapbox.services.android.navigation" >
 
     <uses-sdk
@@ -13,7 +12,7 @@
             android:foregroundServiceType="location" />
         <!-- Include the telemetry service to simplify set up (https://www.mapbox.com/telemetry) -->
         <service
-            android:name="com.mapbox.services.android.telemetry.service.TelemetryService"
+            android:name="com.mapbox.services.android.navigation.v5.navigation.telemetry.MapboxTelemetryService"
             android:foregroundServiceType="location" />
     </application>
 

diff --git a/...uild/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/...uild/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -1,29 +1,28 @@
 1<?xml version="1.0" encoding="utf-8"?>
 2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    xmlns:tools="http://schemas.android.com/tools"
-4    package="com.mapbox.services.android.navigation" >
-5
-6    <uses-sdk
-7        android:minSdkVersion="14"
+3    package="com.mapbox.services.android.navigation" >
+4
+5    <uses-sdk
+6        android:minSdkVersion="14"
+6-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml
+7        android:targetSdkVersion="30" />
 7-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml
-8        android:targetSdkVersion="30" />
-8-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml
-9
-10    <application>
-10-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:5:5-12:19
-11        <service
-11-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:6:9-8:15
-12            android:name="com.mapbox.services.android.navigation.v5.navigation.NavigationService"
-12-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:6:18-103
-13            android:foregroundServiceType="location" />
-13-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:7:13-53
-14        <!-- Include the telemetry service to simplify set up (https://www.mapbox.com/telemetry) -->
-15        <service
-15-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:10:9-11:55
-16            android:name="com.mapbox.services.android.telemetry.service.TelemetryService"
-16-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:10:18-95
-17            android:foregroundServiceType="location" />
-17-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:11:13-53
-18    </application>
-19
-20</manifest>
+8
+9    <application>
+9-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:4:5-11:19
+10        <service
+10-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:5:9-7:15
+11            android:name="com.mapbox.services.android.navigation.v5.navigation.NavigationService"
+11-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:5:18-103
+12            android:foregroundServiceType="location" />
+12-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:6:13-53
+13        <!-- Include the telemetry service to simplify set up (https://www.mapbox.com/telemetry) -->
+14        <service
+14-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:9:9-10:55
+15            android:name="com.mapbox.services.android.navigation.v5.navigation.telemetry.MapboxTelemetryService"
+15-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:9:18-80
+16            android:foregroundServiceType="location" />
+16-->F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:10:13-53
+17    </application>
+18
+19</manifest>
diff --git a/libandroid-navigation/build/outputs/logs/manifest-merger-debug-report.txt b/libandroid-navigation/build/outputs/logs/manifest-merger-debug-report.txt
@@ -1,30 +1,28 @@
 -- Merging decision tree log ---
 manifest
-ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:1:1-14:12
-INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:1:1-14:12
-INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:1:1-14:12
+ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:1:1-13:12
+INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:1:1-13:12
+INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:1:1-13:12
 	package
-		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:3:5-53
+		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:2:5-53
 		INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml
 		INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml
-	xmlns:tools
-		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:2:5-51
 	xmlns:android
 		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:1:11-69
 application
-ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:5:5-12:19
+ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:4:5-11:19
 service#com.mapbox.services.android.navigation.v5.navigation.NavigationService
-ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:6:9-8:15
+ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:5:9-7:15
 	android:foregroundServiceType
-		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:7:13-53
+		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:6:13-53
 	android:name
-		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:6:18-103
-service#com.mapbox.services.android.telemetry.service.TelemetryService
-ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:10:9-11:55
+		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:5:18-103
+service#com.mapbox.services.android.navigation.v5.navigation.telemetry.MapboxTelemetryService
+ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:9:9-10:55
 	android:foregroundServiceType
-		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:11:13-53
+		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:10:13-53
 	android:name
-		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:10:18-95
+		ADDED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml:9:18-80
 uses-sdk
 INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml reason: use-sdk injection requested
 INJECTED from F:\kll\navigation-sdk\libandroid-navigation\src\main\AndroidManifest.xml

diff --git a/libandroid-navigation/src/main/AndroidManifest.xml b/libandroid-navigation/src/main/AndroidManifest.xml
@@ -1,13 +1,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.mapbox.services.android.navigation">
 
     <application>
         <service android:name="com.mapbox.services.android.navigation.v5.navigation.NavigationService"
             android:foregroundServiceType="location"
             />
         <!-- Include the telemetry service to simplify set up (https://www.mapbox.com/telemetry) -->
-        <service android:name="com.mapbox.services.android.telemetry.service.TelemetryService"
+        <service android:name=".v5.navigation.telemetry.MapboxTelemetryService"
             android:foregroundServiceType="location"/>
     </application>