Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use JavaScriptModuleRegistry.getJSModuleName()

Browse Source 
Summary:
It turns out that in release builds, proguard is doing something weird with inner classes, so that getSimpleName() is actually returning "OuterClass$InnerClass" in some cases. We have logic to handle this case already in JavaScriptModuleRegistry, so I'm moving that out to a static method that I can access in bridgeless mode.

Also adding tests for it.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D19701703

fbshipit-source-id: 625737bfb50ca8ba2bd26034e2a74c682783ba8a
This commit is contained in:
Emily Janzer
2020-02-05 15:24:10 -08:00
committed by Facebook Github Bot
parent 014bc95135
commit 73427561f7
4 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/bridge/BUCK
+4 -1
View File
@@ -1,4 +1,4 @@
load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "rn_android_library")
load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "react_native_dep", "react_native_target", "react_native_tests_target", "rn_android_library")
INTERFACES = [
"Dynamic.java",
@@ -30,6 +30,9 @@ rn_android_library(
react_native_dep("third-party/android/androidx:legacy-support-core-utils"),
],
required_for_source_only_abi = True,
tests = [
react_native_tests_target("java/com/facebook/react/bridge:bridge"),
],
visibility = [
"PUBLIC",
],
ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java
+14 -11
View File
@@ -71,17 +71,8 @@ public final class JavaScriptModuleRegistry {
private String getJSModuleName() {
if (mName == null) {
// With proguard obfuscation turned on, proguard apparently (poorly) emulates inner
// classes or something because Class#getSimpleName() no longer strips the outer
// class name. We manually strip it here if necessary.
String name = mModuleInterface.getSimpleName();
int dollarSignIndex = name.lastIndexOf('$');
if (dollarSignIndex != -1) {
name = name.substring(dollarSignIndex + 1);
}
// getting the class name every call is expensive, so cache it
mName = name;
// Getting the class name every call is expensive, so cache it
mName = JavaScriptModuleRegistry.getJSModuleName(mModuleInterface);
}
return mName;
}
@@ -94,4 +85,16 @@ public final class JavaScriptModuleRegistry {
return null;
}
}
public static String getJSModuleName(Class<? extends JavaScriptModule> jsModuleInterface) {
// With proguard obfuscation turned on, proguard apparently (poorly) emulates inner
// classes or something because Class#getSimpleName() no longer strips the outer
// class name. We manually strip it here if necessary.
String name = jsModuleInterface.getSimpleName();
int dollarSignIndex = name.lastIndexOf('$');
if (dollarSignIndex != -1) {
name = name.substring(dollarSignIndex + 1);
}
return name;
}
}