Load Mapbox resources from the maps module

initV2() receives the maps module Resources, we store those, and MapContext returns them from getResources(), getAssets(), and getTheme().

Instead of rebuilding MapContext from a hardcoded GMS package context, we now use the resources provided by the maps dynamite module.

Author: zappybiby

play-services-core/src/main/java/com/google/android/gms/chimera/container/DynamiteContext.java

@@ -7,6 +7,8 @@
 
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.content.res.AssetManager;
+import android.content.res.Resources;
 import android.content.pm.ApplicationInfo;
 
 import androidx.annotation.RequiresApi;
@@ -48,6 +50,16 @@ public ApplicationInfo getApplicationInfo() {
         return gmsContext.getApplicationInfo();
     }
 
+    @Override
+    public Resources getResources() {
+        return gmsContext.getResources();
+    }
+
+    @Override
+    public AssetManager getAssets() {
+        return gmsContext.getAssets();
+    }
+
     @Override
     public Context getApplicationContext() {
         return appContext;

play-services-maps/core/mapbox/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java

@@ -77,6 +77,7 @@ public void initV2(IObjectWrapper resources, int flags) {
             throw new IllegalStateException("Mapbox backend class loader is not available");
         }
         BitmapDescriptorFactoryImpl.INSTANCE.initialize(mapResources, null);
+        MapContext.setModuleResources(mapResources);
         LibraryLoader.setLibraryLoader(new MultiArchLoader(moduleClassLoader));
         Log.d(TAG, "initV2 " + flags);
     }

play-services-maps/core/mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/utils/MapContext.kt

@@ -20,12 +20,14 @@ import android.content.Context
 import android.content.ContextWrapper
 import android.content.Intent
 import android.content.SharedPreferences
+import android.content.res.AssetManager
+import android.content.res.Resources
 import android.view.LayoutInflater
-import org.microg.gms.common.Constants
 import java.io.File
 
-class MapContext(private val context: Context) : ContextWrapper(createModuleContext(context)) {
+class MapContext(private val context: Context) : ContextWrapper(context) {
     private var layoutInflater: LayoutInflater? = null
+    private var theme: Resources.Theme? = null
     private val appContext: Context
         get() = context.applicationContext ?: context
 
@@ -49,6 +51,18 @@ class MapContext(private val context: Context) : ContextWrapper(createModuleCont
         return appContext.packageName
     }
 
+    override fun getResources(): Resources {
+        return getModuleResources()
+    }
+
+    override fun getAssets(): AssetManager {
+        return resources.assets
+    }
+
+    override fun getTheme(): Resources.Theme {
+        return theme ?: resources.newTheme().also { theme = it }
+    }
+
     override fun getClassLoader(): ClassLoader {
         return MapContext::class.java.classLoader!!
     }
@@ -76,8 +90,15 @@ class MapContext(private val context: Context) : ContextWrapper(createModuleCont
     }
 
     companion object {
-        private fun createModuleContext(context: Context): Context {
-            return context.createPackageContext(Constants.GMS_PACKAGE_NAME, Context.CONTEXT_INCLUDE_CODE or Context.CONTEXT_IGNORE_SECURITY)
+        private var moduleResources: Resources? = null
+
+        @JvmStatic
+        fun setModuleResources(resources: Resources) {
+            moduleResources = resources
+        }
+
+        private fun getModuleResources(): Resources {
+            return moduleResources ?: throw IllegalStateException("Resources have not been initialized")
         }
 
         val TAG = "GmsMapContext"