Skip to content

reuse module context in mapbox #3401

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

Draft
zappybiby wants to merge 5 commits into
base: master
Choose a base branch
from
+48 −52
Draft

reuse module context in mapbox #3401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d237cf5
maps: reuse selected module context in mapbox
zappybiby Apr 15, 2026
19f52fa
maps: restore MapContext formatting
zappybiby Apr 15, 2026
f867ebd
maps: drop mapbox compatibility shim
zappybiby Apr 15, 2026
2291b2b
maps/mapbox: use loader-provided resources and classloader
zappybiby Apr 16, 2026
19b9d39
Stop rebuilding Mapbox state from package context
zappybiby Apr 16, 2026
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
13 changes: 11 additions & 2 deletions ...ices-maps/core/mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@
import com.google.android.gms.maps.GoogleMapOptions;
import com.google.android.gms.maps.StreetViewPanoramaOptions;
import com.google.android.gms.maps.model.internal.IBitmapDescriptorFactoryDelegate;
import com.mapbox.mapboxsdk.LibraryLoader;

import org.microg.gms.maps.mapbox.CameraUpdateFactoryImpl;
import org.microg.gms.maps.mapbox.MapFragmentImpl;
import org.microg.gms.maps.mapbox.MapViewImpl;
import org.microg.gms.maps.mapbox.StreetViewPanoramaFragmentImpl;
import org.microg.gms.maps.mapbox.StreetViewPanoramaViewImpl;
import org.microg.gms.maps.mapbox.model.BitmapDescriptorFactoryImpl;
import org.microg.gms.maps.mapbox.utils.MapContext;
import org.microg.gms.maps.mapbox.utils.MultiArchLoader;

@Keep
public class CreatorImpl extends ICreator.Stub {
Expand Down Expand Up @@ -68,8 +71,14 @@ public IBitmapDescriptorFactoryDelegate newBitmapDescriptorFactoryDelegate() {

@Override
public void initV2(IObjectWrapper resources, int flags) {
BitmapDescriptorFactoryImpl.INSTANCE.initialize(ObjectWrapper.unwrapTyped(resources, Resources.class), null);
//ResourcesContainer.set((Resources) ObjectWrapper.unwrap(resources));
Resources mapResources = ObjectWrapper.unwrapTyped(resources, Resources.class);
ClassLoader moduleClassLoader = CreatorImpl.class.getClassLoader();
if (moduleClassLoader == null) {
throw new IllegalStateException("Mapbox backend class loader is not available");
}
BitmapDescriptorFactoryImpl.INSTANCE.initialize(mapResources, null);
MapContext.setModuleEnvironment(mapResources, moduleClassLoader);
LibraryLoader.setLibraryLoader(new MultiArchLoader(moduleClassLoader));
Log.d(TAG, "initV2 " + flags);
}

Expand Down
3 changes: 0 additions & 3 deletions play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/GoogleMap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import com.google.android.gms.maps.internal.*
import com.google.android.gms.maps.model.*
import com.google.android.gms.maps.model.CircleOptions
import com.google.android.gms.maps.model.internal.*
import com.mapbox.mapboxsdk.LibraryLoader
import com.mapbox.mapboxsdk.Mapbox
import com.mapbox.mapboxsdk.R
import com.mapbox.mapboxsdk.camera.CameraUpdate
Expand All @@ -60,7 +59,6 @@ import com.mapbox.mapboxsdk.camera.CameraUpdateFactory
import com.mapbox.mapboxsdk.location.engine.*
import com.mapbox.mapboxsdk.maps.OnMapReadyCallback
import org.microg.gms.maps.mapbox.model.*
import org.microg.gms.maps.mapbox.utils.MultiArchLoader
import org.microg.gms.maps.mapbox.utils.toGms
import org.microg.gms.maps.mapbox.utils.toMapbox
import java.util.concurrent.atomic.AtomicBoolean
Expand Down Expand Up @@ -130,7 +128,6 @@ class GoogleMapImpl(context: Context, var options: GoogleMapOptions) : AbstractG

init {
BitmapDescriptorFactoryImpl.initialize(mapContext.resources, context.resources)
LibraryLoader.setLibraryLoader(MultiArchLoader(mapContext, context))
runOnMainLooper {
Mapbox.getInstance(mapContext, BuildConfig.MAPBOX_KEY, WellKnownTileServer.Mapbox)
}
Expand Down
1 change: 1 addition & 0 deletions play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/MapFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.microg.gms.maps.mapbox

import android.app.Activity
import android.content.Context
import android.os.Bundle
import android.os.Parcel
import android.util.Base64
Expand Down
32 changes: 29 additions & 3 deletions ...-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@

package org.microg.gms.maps.mapbox.utils

import android.content.res.AssetManager
import android.content.Context
import android.content.ContextWrapper
import android.content.Intent
import android.content.res.Resources
import android.content.SharedPreferences
import android.view.LayoutInflater
import org.microg.gms.common.Constants
import java.io.File

class MapContext(private val context: Context) : ContextWrapper(context.createPackageContext(Constants.GMS_PACKAGE_NAME, Context.CONTEXT_INCLUDE_CODE or Context.CONTEXT_IGNORE_SECURITY)) {
class MapContext(private val context: Context) : ContextWrapper(context) {
private var layoutInflater: LayoutInflater? = null
private val appContext: Context
get() = context.applicationContext ?: context
Expand All @@ -49,8 +50,16 @@ class MapContext(private val context: Context) : ContextWrapper(context.createPa
return appContext.packageName
}

override fun getResources(): Resources {
return getModuleResources()
}

override fun getAssets(): AssetManager {
return resources.assets
}

override fun getClassLoader(): ClassLoader {
return MapContext::class.java.classLoader!!
return getModuleClassLoader()
}

override fun getSharedPreferences(name: String?, mode: Int): SharedPreferences {
Expand All @@ -76,6 +85,23 @@ class MapContext(private val context: Context) : ContextWrapper(context.createPa
}

companion object {
private var moduleResources: Resources? = null
private var moduleClassLoader: ClassLoader? = null

@JvmStatic
fun setModuleEnvironment(resources: Resources, classLoader: ClassLoader) {
moduleResources = resources
moduleClassLoader = classLoader
}

private fun getModuleResources(): Resources {
return moduleResources ?: throw IllegalStateException("Resources have not been initialized")
}

private fun getModuleClassLoader(): ClassLoader {
return moduleClassLoader ?: throw IllegalStateException("Class loader has not been initialized")
}

val TAG = "GmsMapContext"
}
}
51 changes: 7 additions & 44 deletions ...ices-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MultiArchLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,45 +17,17 @@
package org.microg.gms.maps.mapbox.utils

import android.annotation.SuppressLint
import android.content.Context
import android.content.pm.ApplicationInfo
import android.util.Log
import com.mapbox.mapboxsdk.LibraryLoader
import org.microg.gms.common.Constants
import org.microg.gms.common.PackageUtils
import java.io.*
import java.util.zip.ZipFile
import dalvik.system.BaseDexClassLoader

class MultiArchLoader(private val mapContext: Context, private val appContext: Context) : LibraryLoader() {
class MultiArchLoader(private val moduleClassLoader: ClassLoader) : LibraryLoader() {
@SuppressLint("UnsafeDynamicallyLoadedCode")
override fun load(name: String) {
try {
val otherAppInfo = mapContext.packageManager.getApplicationInfo(appContext.packageName, 0)
var primaryCpuAbi = ApplicationInfo::class.java.getField("primaryCpuAbi").get(otherAppInfo) as String?
if (primaryCpuAbi == "armeabi") {
primaryCpuAbi = "armeabi-v7a"
}
if (primaryCpuAbi != null) {
val path = "lib/$primaryCpuAbi/lib$name.so"
val cacheFile = File("${appContext.cacheDir.absolutePath}/.gmscore/$path")
cacheFile.parentFile?.mkdirs()
val cacheFileStamp = File("${appContext.cacheDir.absolutePath}/.gmscore/$path.stamp")
val cacheVersion = kotlin.runCatching { cacheFileStamp.readText() }.getOrNull()
// TODO: Use better version indicator
val mapVersion = PackageUtils.versionName(mapContext, Constants.GMS_PACKAGE_NAME)
val apkFile = File(mapContext.packageCodePath)
if (!cacheFile.exists() || cacheVersion == null || cacheVersion != mapVersion) {
val zipFile = ZipFile(apkFile)
val entry = zipFile.getEntry(path)
if (entry != null) {
copyInputStream(zipFile.getInputStream(entry), FileOutputStream(cacheFile))
} else {
Log.d(TAG, "Can't load native library: $path does not exist in $apkFile")
}
cacheFileStamp.writeText(mapVersion.toString())
}
Log.d(TAG, "Loading $name from ${cacheFile.getPath()}")
System.load(cacheFile.absolutePath)
findLibrary(name)?.let { path ->
Log.d(TAG, "Loading $name from $path")
System.load(path)
return
}
} catch (e: Exception) {
Expand All @@ -65,17 +37,8 @@ class MultiArchLoader(private val mapContext: Context, private val appContext: C
System.loadLibrary(name)
}

@Throws(IOException::class)
private fun copyInputStream(inp: InputStream, out: OutputStream) {
val buffer = ByteArray(1024)
var len: Int = inp.read(buffer)
while (len >= 0) {
out.write(buffer, 0, len)
len = inp.read(buffer)
}

inp.close()
out.close()
private fun findLibrary(name: String): String? {
return (moduleClassLoader as? BaseDexClassLoader)?.findLibrary(name)
}

companion object {
Expand Down