fix: resource resolution for dynamic feature modules

electrode-io · Jun 6, 2024 · a6667ed · a6667ed
1 parent d8d8af8
commit a6667ed
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/...react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ColorPropConverter.java b/...react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ColorPropConverter.java
@@ -99,7 +99,7 @@ public static Integer resolveResourcePath(Context context, @Nullable String reso
   private static int resolveResource(Context context, String resourcePath) {
     String[] pathTokens = resourcePath.split(PACKAGE_DELIMITER);
 
-    String packageName = context.getPackageName();
+    String packageName = ReactApplicationContext.PACKAGE_NAME == null ? context.getPackageName() : ReactApplicationContext.PACKAGE_NAME;
     String resource = resourcePath;
 
     if (pathTokens.length > 1) {
@@ -120,7 +120,7 @@ private static int resolveThemeAttribute(Context context, String resourcePath) {
     String path = resourcePath.replaceAll(ATTR_SEGMENT, "");
     String[] pathTokens = path.split(PACKAGE_DELIMITER);
 
-    String packageName = context.getPackageName();
+    String packageName = ReactApplicationContext.PACKAGE_NAME == null ? context.getPackageName() : ReactApplicationContext.PACKAGE_NAME;
     String resourceName = path;
 
     if (pathTokens.length > 1) {

diff --git a/...-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java b/...-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactApplicationContext.java
@@ -20,4 +20,6 @@ public class ReactApplicationContext extends ReactContext {
   public ReactApplicationContext(Context context) {
     super(context.getApplicationContext());
   }
+
+  public static String PACKAGE_NAME = null;
 }
diff --git a/...s/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/...s/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java
@@ -152,7 +152,7 @@ public void initialize() {
     // The application can register BlobProvider as a ContentProvider so that blobs are resolvable.
     // If it does, it needs to tell us what authority was used via this string resource.
     Resources resources = getReactApplicationContext().getResources();
-    String packageName = getReactApplicationContext().getPackageName();
+    String packageName = ReactApplicationContext.PACKAGE_NAME == null ? getReactApplicationContext().getPackageName() : ReactApplicationContext.PACKAGE_NAME;
     int resourceId = resources.getIdentifier("blob_provider_authority", "string", packageName);
     if (resourceId == 0) {
       return MapBuilder.<String, Object>of();

diff --git a/...tAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java b/...tAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
@@ -11,6 +11,7 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.ReactApplicationContext;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -61,20 +62,20 @@ public int getResourceDrawableId(Context context, @Nullable String name) {
       if (mResourceDrawableIdMap.containsKey(name)) {
         return mResourceDrawableIdMap.get(name);
       }
-      int id = context.getResources().getIdentifier(name, "drawable", context.getPackageName());
+      int id = context.getResources().getIdentifier(name, "drawable", ReactApplicationContext.PACKAGE_NAME == null ? context.getPackageName() : ReactApplicationContext.PACKAGE_NAME);
       mResourceDrawableIdMap.put(name, id);
       return id;
     }
   }
 
   public @Nullable Drawable getResourceDrawable(Context context, @Nullable String name) {
     int resId = getResourceDrawableId(context, name);
-    return resId > 0 ? context.getResources().getDrawable(resId) : null;
+    return resId != 0 ? context.getResources().getDrawable(resId) : null;
   }
 
   public Uri getResourceDrawableUri(Context context, @Nullable String name) {
     int resId = getResourceDrawableId(context, name);
-    return resId > 0
+    return resId != 0
         ? new Uri.Builder().scheme(LOCAL_RESOURCE_SCHEME).path(String.valueOf(resId)).build()
         : Uri.EMPTY;
   }

diff --git a/...om/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java b/...om/facebook/react/views/text/frescosupport/FrescoBasedReactTextInlineImageShadowNode.java
@@ -119,7 +119,7 @@ public ReadableMap getHeaders() {
       return null;
     }
     name = name.toLowerCase(Locale.getDefault()).replace("-", "_");
-    int resId = context.getResources().getIdentifier(name, "drawable", context.getPackageName());
+    int resId = context.getResources().getIdentifier(name, "drawable", ReactApplicationContext.PACKAGE_NAME == null ? context.getPackageName() : ReactApplicationContext.PACKAGE_NAME);
     return new Uri.Builder()
         .scheme(UriUtil.LOCAL_RESOURCE_SCHEME)
         .path(String.valueOf(resId))