From af533ac7f10ae901e7ab456208ee8d7bb9257033 Mon Sep 17 00:00:00 2001 From: Marc Horowitz Date: Wed, 5 Apr 2017 00:51:58 -0700 Subject: [PATCH] Remove the dependency of I18nManagerModule on ReactApplicationContext Reviewed By: javache Differential Revision: D4809492 fbshipit-source-id: 775c6b95aab734568ea4750804477c04d13502b6 --- .../i18nmanager/I18nManagerModule.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java index 90e27eef70..b3e2deacc6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/i18nmanager/I18nManagerModule.java @@ -11,9 +11,9 @@ package com.facebook.react.modules.i18nmanager; import android.content.Context; +import com.facebook.react.bridge.ContextBaseJavaModule; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactMethod; import com.facebook.react.common.MapBuilder; import com.facebook.react.module.annotations.ReactModule; @@ -25,12 +25,12 @@ import java.util.Map; * {@link NativeModule} that allows JS to set allowRTL and get isRTL status. */ @ReactModule(name = "I18nManager") -public class I18nManagerModule extends ReactContextBaseJavaModule { +public class I18nManagerModule extends ContextBaseJavaModule { private final I18nUtil sharedI18nUtilInstance = I18nUtil.getInstance(); - public I18nManagerModule(ReactApplicationContext reactContext) { - super(reactContext); + public I18nManagerModule(Context context) { + super(context); } @Override @@ -40,26 +40,22 @@ public class I18nManagerModule extends ReactContextBaseJavaModule { @Override public Map getConstants() { - final Context context = getReactApplicationContext().getBaseContext(); + final Context context = getContext(); final Locale locale = context.getResources().getConfiguration().locale; final Map constants = MapBuilder.newHashMap(); - constants.put("isRTL", sharedI18nUtilInstance.isRTL(getReactApplicationContext())); + constants.put("isRTL", sharedI18nUtilInstance.isRTL(context)); constants.put("localeIdentifier", locale.toString()); return constants; } @ReactMethod public void allowRTL(boolean value) { - sharedI18nUtilInstance.allowRTL( - getReactApplicationContext(), - value); + sharedI18nUtilInstance.allowRTL(getContext(), value); } @ReactMethod public void forceRTL(boolean value) { - sharedI18nUtilInstance.forceRTL( - getReactApplicationContext(), - value); + sharedI18nUtilInstance.forceRTL(getContext(), value); } }