From b96861c21799d8fd86e09ee71d2a3f79467e6fd1 Mon Sep 17 00:00:00 2001
From: dzmitryfomchyn <Dzmitry.Fomchyn@mapbox.com>
Date: Mon, 26 Feb 2024 13:14:02 +0100
Subject: [PATCH] Address code review comments

---
 changelog/unreleased/bugfixes/7753.md                         | 3 ++-
 .../mapbox/navigation/core/adas/AdasisDataSendingConfig.kt    | 2 +-
 .../core/internal/MapboxNavigationSDKInitializerImpl.kt       | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changelog/unreleased/bugfixes/7753.md b/changelog/unreleased/bugfixes/7753.md
index 56b0892dd6a..d3b6fc00f6f 100644
--- a/changelog/unreleased/bugfixes/7753.md
+++ b/changelog/unreleased/bugfixes/7753.md
@@ -1,3 +1,4 @@
 - Fix adasis generator errors related to the split edges.
 - Fix adas cache tiles eviction mechanism.
-- Handle "unlilimited" speed limits in Adasis.
\ No newline at end of file
+- Handle "unlilimited" speed limits in Adasis.
+- Fixed possible `java.lang.UnsatisfiedLinkError` crash on application startup when Mapbox native libraries could not yet be found.
\ No newline at end of file
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/adas/AdasisDataSendingConfig.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/adas/AdasisDataSendingConfig.kt
index 384e20c209a..4822f41c946 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/adas/AdasisDataSendingConfig.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/adas/AdasisDataSendingConfig.kt
@@ -93,7 +93,7 @@ class AdasisDataSendingConfig private constructor(
             "messagesInPackage=$messagesInPackage, " +
             "metadataCycleSeconds=$metadataCycleSeconds, " +
             "enableRetransmission=$enableRetransmission, " +
-            "retransmissionMeters=$retransmissionMeters," +
+            "retransmissionMeters=$retransmissionMeters, " +
             "treeTrailingLength=$treeTrailingLength" +
             ")"
     }
diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/MapboxNavigationSDKInitializerImpl.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/MapboxNavigationSDKInitializerImpl.kt
index 90ea0475f0f..6f4f88e9d0c 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/MapboxNavigationSDKInitializerImpl.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/MapboxNavigationSDKInitializerImpl.kt
@@ -2,7 +2,7 @@ package com.mapbox.navigation.core.internal
 
 import android.content.Context
 import androidx.startup.Initializer
-import com.mapbox.common.MapboxSDKCommonInitializer
+import com.mapbox.common.MapboxSDKCommonInitializerImpl
 import com.mapbox.common.SdkInfoRegistryFactory
 import com.mapbox.common.SdkInformation
 import com.mapbox.navigation.core.BuildConfig
@@ -22,6 +22,6 @@ class MapboxNavigationSDKInitializerImpl : Initializer<MapboxNavigationSDK> {
     }
 
     override fun dependencies(): MutableList<Class<out Initializer<*>>> {
-        return mutableListOf(MapboxSDKCommonInitializer::class.java)
+        return mutableListOf(MapboxSDKCommonInitializerImpl::class.java)
     }
 }