Skip to content

FIX: mapbox: pixelRatio may not be <= 0 #3555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pellaeon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX: mapbox: pixelRatio may not be <= 0 #3555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion ...s/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.microg.gms.maps.mapbox.model
import android.content.res.Resources
import android.graphics.*
import android.os.Parcel
import android.util.DisplayMetrics
import android.util.Log
import com.google.android.gms.dynamic.IObjectWrapper
import com.google.android.gms.dynamic.ObjectWrapper
Expand Down Expand Up @@ -108,7 +109,7 @@ object BitmapDescriptorFactoryImpl : IBitmapDescriptorFactoryDelegate.Stub() {
private fun registerBitmap(id: String, descriptorCreator: (id: String, size: FloatArray) -> BitmapDescriptorImpl = { id, size -> BitmapDescriptorImpl(id, size) }, bitmapCreator: () -> Bitmap?): IObjectWrapper {
val bitmap: Bitmap? = synchronized(bitmaps) {
if (bitmaps.contains(id)) return@synchronized null
val bitmap = bitmapCreator()
val bitmap = bitmapCreator()?.ensureMapboxDensity(id)
if (bitmap == null) {
Log.w(TAG, "Failed to register bitmap $id, creator returned null")
return@synchronized null
Expand All @@ -134,6 +135,26 @@ object BitmapDescriptorFactoryImpl : IBitmapDescriptorFactoryDelegate.Stub() {
return ObjectWrapper.wrap(descriptorCreator(id, bitmapSize(id)))
}

private fun Bitmap.ensureMapboxDensity(id: String): Bitmap {
if (density > 0) return this

val densityDpi = resources?.displayMetrics?.densityDpi
?: mapResources?.displayMetrics?.densityDpi
?: DisplayMetrics.DENSITY_DEFAULT

Log.w(TAG, "Bitmap $id has density=$density; using densityDpi=$densityDpi for Mapbox")

return try {
copy(config ?: Bitmap.Config.ARGB_8888, false).also {
it.density = densityDpi
}
} catch (e: Throwable) {
this.also {
it.density = densityDpi
}
}
}

override fun fromResource(resourceId: Int): IObjectWrapper = registerBitmap("resource-$resourceId") {
val bitmap = BitmapFactory.decodeResource(resources, resourceId)
if (bitmap == null) {
Expand Down