creating a location sharing config for holding the map tiler key
This commit is contained in:
parent
012485b8e3
commit
56afac26ad
|
@ -38,6 +38,7 @@ object Config {
|
|||
const val ALLOW_EXTERNAL_UNIFIED_PUSH_DISTRIBUTORS = true
|
||||
|
||||
const val ENABLE_LOCATION_SHARING = true
|
||||
const val LOCATION_MAP_TILER_KEY = "fU3vlMsMn4Jb6dnEIFsx"
|
||||
|
||||
/**
|
||||
* The maximum length of voice messages in milliseconds.
|
||||
|
|
|
@ -160,8 +160,6 @@ android {
|
|||
// This *must* only be set in trusted environments.
|
||||
buildConfigField "Boolean", "handleCallAssertedIdentityEvents", "false"
|
||||
|
||||
buildConfigField "String", "mapTilerKey", "\"fU3vlMsMn4Jb6dnEIFsx\""
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
||||
// Keep abiFilter for the universalApk
|
||||
|
|
|
@ -27,6 +27,7 @@ import im.vector.app.config.KeySharingStrategy
|
|||
import im.vector.app.features.analytics.AnalyticsConfig
|
||||
import im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy
|
||||
import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageConfig
|
||||
import im.vector.app.features.location.LocationSharingConfig
|
||||
import im.vector.app.features.raw.wellknown.CryptoConfig
|
||||
|
||||
@InstallIn(SingletonComponent::class)
|
||||
|
@ -63,4 +64,9 @@ object ConfigurationModule {
|
|||
KeySharingStrategy.WhenTyping -> OutboundSessionKeySharingStrategy.WhenSendingEvent
|
||||
}
|
||||
)
|
||||
|
||||
@Provides
|
||||
fun providesLocationSharingConfig() = LocationSharingConfig(
|
||||
mapTilerKey = Config.LOCATION_MAP_TILER_KEY,
|
||||
)
|
||||
}
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* Copyright (c) 2022 New Vector Ltd
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package im.vector.app.features.location
|
||||
|
||||
data class LocationSharingConfig(
|
||||
val mapTilerKey: String,
|
||||
)
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
package im.vector.app.features.location
|
||||
|
||||
import im.vector.app.BuildConfig
|
||||
import im.vector.app.features.raw.wellknown.getElementWellknown
|
||||
import org.matrix.android.sdk.api.extensions.tryOrNull
|
||||
import org.matrix.android.sdk.api.raw.RawService
|
||||
|
@ -25,9 +24,10 @@ import javax.inject.Inject
|
|||
|
||||
class UrlMapProvider @Inject constructor(
|
||||
private val session: Session,
|
||||
private val rawService: RawService
|
||||
private val rawService: RawService,
|
||||
locationSharingConfig: LocationSharingConfig,
|
||||
) {
|
||||
private val keyParam = "?key=${BuildConfig.mapTilerKey}"
|
||||
private val keyParam = "?key=${locationSharingConfig.mapTilerKey}"
|
||||
|
||||
private val fallbackMapUrl = buildString {
|
||||
append(MAP_BASE_URL)
|
||||
|
|
Loading…
Reference in New Issue