-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: native search sdk 1.1.0 update for startup fixes (#250)
* fix: native search sdk 1.1.0 update for startup fixes * style: fixing linter issues * style: fixing linter issues * chore: regenerating the license
- Loading branch information
1 parent
5e5b342
commit 2a8a883
Showing
16 changed files
with
83 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 3 additions & 35 deletions
38
MapboxSearch/base/src/main/java/com/mapbox/search/base/BaseSearchSdkInitializer.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,7 @@ | ||
| package com.mapbox.search.base | ||
|
|
||
| import android.app.Application | ||
| import android.content.Context | ||
| import androidx.startup.Initializer | ||
| import com.mapbox.common.MapboxSDKCommonInitializer | ||
| import com.mapbox.common.SdkInfoRegistryFactory | ||
| import com.mapbox.common.SdkInformation | ||
| import com.mapbox.common.core.module.CommonSingletonModuleProvider | ||
| import com.mapbox.search.base.utils.UserAgentProvider | ||
| import com.mapbox.common.BaseMapboxInitializer | ||
|
|
||
| class BaseSearchSdkInitializer : Initializer<Unit> { | ||
|
|
||
| override fun create(context: Context) { | ||
| appContext = context.applicationContext | ||
| CommonSingletonModuleProvider.loaderInstance.load(SEARCH_SDK_NATIVE_LIBRARY_NAME) | ||
|
|
||
| SdkInfoRegistryFactory.getInstance().registerSdkInformation( | ||
| SdkInformation( | ||
| UserAgentProvider.sdkName, | ||
| UserAgentProvider.sdkVersionName, | ||
| UserAgentProvider.sdkPackageName | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun dependencies(): List<Class<out Initializer<*>>> { | ||
| return listOf(MapboxSDKCommonInitializer::class.java) | ||
| } | ||
|
|
||
| companion object { | ||
| private const val SEARCH_SDK_NATIVE_LIBRARY_NAME = "SearchCore" | ||
|
|
||
| lateinit var appContext: Context | ||
|
|
||
| val app: Application | ||
| get() = appContext as Application | ||
| } | ||
| class BaseSearchSdkInitializer : BaseMapboxInitializer<Unit>() { | ||
| override val initializerClass = BaseSearchSdkInitializerImpl::class.java | ||
| } |
35 changes: 35 additions & 0 deletions
35
MapboxSearch/base/src/main/java/com/mapbox/search/base/BaseSearchSdkInitializerImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package com.mapbox.search.base | ||
|
|
||
| import android.app.Application | ||
| import android.content.Context | ||
| import androidx.startup.Initializer | ||
| import com.mapbox.common.SdkInfoRegistryFactory | ||
| import com.mapbox.common.SdkInformation | ||
| import com.mapbox.search.base.utils.UserAgentProvider | ||
| import com.mapbox.search.core.MapboxSearchCoreInitializerImpl | ||
|
|
||
| class BaseSearchSdkInitializerImpl : Initializer<Unit> { | ||
|
|
||
| override fun create(context: Context) { | ||
| appContext = context.applicationContext | ||
|
|
||
| SdkInfoRegistryFactory.getInstance().registerSdkInformation( | ||
| SdkInformation( | ||
| UserAgentProvider.sdkName, | ||
| UserAgentProvider.sdkVersionName, | ||
| UserAgentProvider.sdkPackageName | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| override fun dependencies(): List<Class<out Initializer<*>>> { | ||
| return listOf(MapboxSearchCoreInitializerImpl::class.java) | ||
| } | ||
|
|
||
| companion object { | ||
| lateinit var appContext: Context | ||
|
|
||
| val app: Application | ||
| get() = appContext as Application | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 3 additions & 13 deletions
16
MapboxSearch/sdk/src/main/java/com/mapbox/search/MapboxSearchSdkInitializer.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,7 @@ | ||
| package com.mapbox.search | ||
|
|
||
| import android.app.Application | ||
| import android.content.Context | ||
| import androidx.startup.Initializer | ||
| import com.mapbox.search.base.BaseSearchSdkInitializer | ||
| import com.mapbox.common.BaseMapboxInitializer | ||
|
|
||
| internal class MapboxSearchSdkInitializer : Initializer<MapboxSearchSdk> { | ||
| override fun create(context: Context): MapboxSearchSdk { | ||
| MapboxSearchSdk.initialize(context.applicationContext as Application) | ||
| return MapboxSearchSdk | ||
| } | ||
|
|
||
| override fun dependencies(): List<Class<out Initializer<*>>> { | ||
| return listOf(BaseSearchSdkInitializer::class.java) | ||
| } | ||
| internal class MapboxSearchSdkInitializer : BaseMapboxInitializer<MapboxSearchSdk>() { | ||
| override val initializerClass = MapboxSearchSdkInitializerImpl::class.java | ||
| } |
17 changes: 17 additions & 0 deletions
17
MapboxSearch/sdk/src/main/java/com/mapbox/search/MapboxSearchSdkInitializerImpl.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.mapbox.search | ||
|
|
||
| import android.app.Application | ||
| import android.content.Context | ||
| import androidx.startup.Initializer | ||
| import com.mapbox.search.base.BaseSearchSdkInitializerImpl | ||
|
|
||
| internal class MapboxSearchSdkInitializerImpl : Initializer<MapboxSearchSdk> { | ||
| override fun create(context: Context): MapboxSearchSdk { | ||
| MapboxSearchSdk.initialize(context.applicationContext as Application) | ||
| return MapboxSearchSdk | ||
| } | ||
|
|
||
| override fun dependencies(): List<Class<out Initializer<*>>> { | ||
| return listOf(BaseSearchSdkInitializerImpl::class.java) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters