diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java index ad10a6e7c..0baef21f2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerImpl.java @@ -17,7 +17,6 @@ import java.util.List; import java.util.concurrent.ConcurrentLinkedQueue; import android.app.Activity; -import android.app.Application; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; @@ -47,7 +46,6 @@ import com.facebook.react.bridge.UiThreadUtil; import com.facebook.react.bridge.WritableMap; import com.facebook.react.bridge.WritableNativeMap; import com.facebook.react.bridge.queue.CatalystQueueConfigurationSpec; -import com.facebook.react.common.ApplicationHolder; import com.facebook.react.common.ReactConstants; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.devsupport.DevServerHelper; @@ -204,9 +202,6 @@ import com.facebook.systrace.Systrace; NativeModuleCallExceptionHandler nativeModuleCallExceptionHandler) { initializeSoLoaderIfNecessary(applicationContext); - // TODO(9577825): remove this - ApplicationHolder.setApplication((Application) applicationContext.getApplicationContext()); - mApplicationContext = applicationContext; mJSBundleFile = jsBundleFile; mJSMainModuleName = jsMainModuleName; diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/ApplicationHolder.java b/ReactAndroid/src/main/java/com/facebook/react/common/ApplicationHolder.java deleted file mode 100644 index 535b81597..000000000 --- a/ReactAndroid/src/main/java/com/facebook/react/common/ApplicationHolder.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Copyright (c) 2015-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - */ - -package com.facebook.react.common; - -import android.app.Application; - -import com.facebook.infer.annotation.Assertions; -import com.facebook.proguard.annotations.DoNotStrip; - -/** - * Holds the current Application Object. - * - * TODO(9577825): This is a bad pattern, we should thread through an Environment object instead. - * Remove once bridge is unforked. - */ -@DoNotStrip -@Deprecated -public class ApplicationHolder { - - private static Application sApplication; - - public static void setApplication(Application application) { - sApplication = application; - } - - public static Application getApplication() { - return Assertions.assertNotNull(sApplication); - } -} diff --git a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp index db8b4d980..416640a37 100644 --- a/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp +++ b/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include #include @@ -19,19 +18,6 @@ using fbsystrace::FbSystraceSection; namespace facebook { namespace react { -static jclass gApplicationHolderClass; -static jmethodID gGetApplicationMethod; -static jmethodID gGetAssetManagerMethod; - -std::string loadScriptFromAssets(std::string assetName) { - JNIEnv *env = jni::Environment::current(); - jobject application = env->CallStaticObjectMethod( - gApplicationHolderClass, - gGetApplicationMethod); - jobject assetManager = env->CallObjectMethod(application, gGetAssetManagerMethod); - return loadScriptFromAssets(env, assetManager, assetName); -} - std::string loadScriptFromAssets( JNIEnv *env, jobject assetManager, @@ -85,14 +71,4 @@ std::string loadScriptFromFile(std::string fileName) { return ""; } -void registerJSLoaderNatives() { - JNIEnv *env = jni::Environment::current(); - jclass applicationHolderClass = env->FindClass("com/facebook/react/common/ApplicationHolder"); - gApplicationHolderClass = (jclass)env->NewGlobalRef(applicationHolderClass); - gGetApplicationMethod = env->GetStaticMethodID(applicationHolderClass, "getApplication", "()Landroid/app/Application;"); - - jclass appClass = env->FindClass("android/app/Application"); - gGetAssetManagerMethod = env->GetMethodID(appClass, "getAssets", "()Landroid/content/res/AssetManager;"); -} - -} } +} } \ No newline at end of file diff --git a/ReactAndroid/src/main/jni/react/jni/JSLoader.h b/ReactAndroid/src/main/jni/react/jni/JSLoader.h index 25dab510d..c7381fe7e 100644 --- a/ReactAndroid/src/main/jni/react/jni/JSLoader.h +++ b/ReactAndroid/src/main/jni/react/jni/JSLoader.h @@ -8,12 +8,6 @@ namespace facebook { namespace react { -/** - * Helper method for loading a JS script from Android assets without - * a reference to an AssetManager. - */ -std::string loadScriptFromAssets(std::string assetName); - /** * Helper method for loading JS script from android asset */ @@ -24,6 +18,4 @@ std::string loadScriptFromAssets(JNIEnv *env, jobject assetManager, std::string */ std::string loadScriptFromFile(std::string fileName); -void registerJSLoaderNatives(); - } } diff --git a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index 6eb6d523e..5ef5c28aa 100644 --- a/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp @@ -780,7 +780,6 @@ extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { NativeArray::registerNatives(); ReadableNativeArray::registerNatives(); WritableNativeArray::registerNatives(); - registerJSLoaderNatives(); registerNatives("com/facebook/react/bridge/NativeMap", { makeNativeMethod("initialize", map::initialize),