chore: Upgrade to MapLibre 11.8.2 (from 10.x), should fix error flooding in sentry (77b82ebb) · Commits · e / os / Advanced Privacy

app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationFragment.kt

+17 −17

Original line number	Diff line number	Diff line
		@@ -38,18 +38,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
		import com.google.android.material.textfield.TextInputLayout
		import com.google.android.material.textfield.TextInputLayout.END_ICON_CUSTOM
		import com.google.android.material.textfield.TextInputLayout.END_ICON_NONE
		import com.mapbox.android.gestures.MoveGestureDetector
		import com.mapbox.mapboxsdk.Mapbox
		import com.mapbox.mapboxsdk.WellKnownTileServer
		import com.mapbox.mapboxsdk.camera.CameraPosition
		import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
		import com.mapbox.mapboxsdk.geometry.LatLng
		import com.mapbox.mapboxsdk.location.LocationComponent
		import com.mapbox.mapboxsdk.location.LocationComponentActivationOptions
		import com.mapbox.mapboxsdk.location.modes.CameraMode
		import com.mapbox.mapboxsdk.location.modes.RenderMode
		import com.mapbox.mapboxsdk.maps.MapboxMap
		import com.mapbox.mapboxsdk.maps.Style
		import foundation.e.advancedprivacy.R
		import foundation.e.advancedprivacy.common.NavToolbarFragment
		import foundation.e.advancedprivacy.common.setToolTipForAsterisk
		@@ -61,6 +49,18 @@ import kotlinx.coroutines.Job
		import kotlinx.coroutines.delay
		import kotlinx.coroutines.launch
		import org.koin.androidx.viewmodel.ext.android.viewModel
		import org.maplibre.android.MapLibre
		import org.maplibre.android.WellKnownTileServer
		import org.maplibre.android.camera.CameraPosition
		import org.maplibre.android.camera.CameraUpdateFactory
		import org.maplibre.android.geometry.LatLng
		import org.maplibre.android.gestures.MoveGestureDetector
		import org.maplibre.android.location.LocationComponent
		import org.maplibre.android.location.LocationComponentActivationOptions
		import org.maplibre.android.location.modes.CameraMode
		import org.maplibre.android.location.modes.RenderMode
		import org.maplibre.android.maps.MapLibreMap
		import org.maplibre.android.maps.Style
		import timber.log.Timber

		class FakeLocationFragment : NavToolbarFragment(R.layout.fragment_fake_location) {
		@@ -72,7 +72,7 @@ class FakeLocationFragment : NavToolbarFragment(R.layout.fragment_fake_location)
		private var _binding: FragmentFakeLocationBinding? = null
		private val binding get() = _binding!!

		private var mapboxMap: MapboxMap? = null
		private var mapboxMap: MapLibreMap? = null
		private var locationComponent: LocationComponent? = null

		private var inputJob: Job? = null
		@@ -95,7 +95,7 @@ class FakeLocationFragment : NavToolbarFragment(R.layout.fragment_fake_location)

		override fun onAttach(context: Context) {
		super.onAttach(context)
		Mapbox.getInstance(requireContext(), getString(R.string.mapbox_key), WellKnownTileServer.Mapbox)
		MapLibre.getInstance(requireContext(), getString(R.string.mapbox_key), WellKnownTileServer.Mapbox)
		}

		private fun displayToast(message: String) {
		@@ -142,9 +142,9 @@ class FakeLocationFragment : NavToolbarFragment(R.layout.fragment_fake_location)
		startListening()
		}

		private val onMoveListener = object : MapboxMap.OnMoveListener {
		private val cameraIdleListener: MapboxMap.OnCameraIdleListener =
		object : MapboxMap.OnCameraIdleListener {
		private val onMoveListener = object : MapLibreMap.OnMoveListener {
		private val cameraIdleListener: MapLibreMap.OnCameraIdleListener =
		object : MapLibreMap.OnCameraIdleListener {
		override fun onCameraIdle() {
		mapboxMap?.cameraPosition?.target?.let {
		viewModel.submitAction(

app/src/main/java/foundation/e/advancedprivacy/features/location/FakeLocationMapView.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ import android.content.Context
		import android.os.Bundle
		import android.util.AttributeSet
		import android.view.MotionEvent
		import com.mapbox.mapboxsdk.maps.MapView
		import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
		import org.maplibre.android.maps.MapView
		import org.maplibre.android.maps.OnMapReadyCallback

		class FakeLocationMapView @JvmOverloads constructor(
		context: Context,

gradle/libs.versions.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin"
		koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
		kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
		leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version = "2.10" }
		maplibre = { group = "org.maplibre.gl", name = "android-sdk", version = "10.2.0" }
		maplibre = { group = "org.maplibre.gl", name = "android-sdk", version = "11.8.2" }
		mpandroidcharts = { group = "com.github.PhilJay", name = "MPAndroidChart", version = "v3.1.0" }
		pcap4j = { group = "org.pcap4j", name = "pcap4j-core", version.ref = "pcap4j" }
		pcap4j-packetfactory-static = { group = "org.pcap4j", name = "pcap4j-packetfactory-static", version.ref = "pcap4j" }