Skip to content
This repository was archived by the owner on Apr 2, 2021. It is now read-only.

Use locale insensitive toUpperCase and toLowerCase #729

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use locale insensitive toUpperCase and toLowerCase #729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion android/src/main/java/com/facebook/reactnative/androidsdk/FBAppEventsLoggerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

import java.math.BigDecimal;
import java.util.Currency;
import java.util.Locale;

/**
* <p>
Expand Down Expand Up @@ -133,7 +134,7 @@ public String getName() {
*/
@ReactMethod
public void setFlushBehavior(String flushBehavior) {
AppEventsLogger.setFlushBehavior(AppEventsLogger.FlushBehavior.valueOf(flushBehavior.toUpperCase()));
AppEventsLogger.setFlushBehavior(AppEventsLogger.FlushBehavior.valueOf(flushBehavior.toUpperCase(Locale.ROOT)));
}

/**
Expand Down
6 changes: 4 additions & 2 deletions android/src/main/java/com/facebook/reactnative/androidsdk/FBLoginButtonManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import com.facebook.react.uimanager.SimpleViewManager;
import com.facebook.react.uimanager.ThemedReactContext;

import java.util.Locale;


public class FBLoginButtonManager extends SimpleViewManager<RCTLoginButton> {

Expand All @@ -54,12 +56,12 @@ public RCTLoginButton createViewInstance(ThemedReactContext context) {

@ReactProp(name = "loginBehaviorAndroid")
public void setLoginBehavior(RCTLoginButton loginButton, @Nullable String loginBehavior) {
loginButton.setLoginBehavior(LoginBehavior.valueOf(loginBehavior.toUpperCase()));
loginButton.setLoginBehavior(LoginBehavior.valueOf(loginBehavior.toUpperCase(Locale.ROOT)));
}

@ReactProp(name = "defaultAudience")
public void setDefaultAudience(RCTLoginButton loginButton, @Nullable String defaultAudience) {
loginButton.setDefaultAudience(DefaultAudience.valueOf(defaultAudience.toUpperCase()));
loginButton.setDefaultAudience(DefaultAudience.valueOf(defaultAudience.toUpperCase(Locale.ROOT)));
}

@ReactProp(name = "permissions")
Expand Down
9 changes: 5 additions & 4 deletions android/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.module.annotations.ReactModule;

import java.util.Locale;
import java.util.Set;

/**
Expand Down Expand Up @@ -85,7 +86,7 @@ public String getName() {
*/
@ReactMethod
public void getLoginBehavior(Promise promise) {
promise.resolve(LoginManager.getInstance().getLoginBehavior().name().toLowerCase());
promise.resolve(LoginManager.getInstance().getLoginBehavior().name().toLowerCase(Locale.ROOT));
}

/**
Expand All @@ -96,7 +97,7 @@ public void getLoginBehavior(Promise promise) {
*/
@ReactMethod
public void setLoginBehavior(String loginBehaviorString) {
LoginBehavior loginBehavior = LoginBehavior.valueOf(loginBehaviorString.toUpperCase());
LoginBehavior loginBehavior = LoginBehavior.valueOf(loginBehaviorString.toUpperCase(Locale.ROOT));
LoginManager.getInstance().setLoginBehavior(loginBehavior);
}

Expand All @@ -106,7 +107,7 @@ public void setLoginBehavior(String loginBehaviorString) {
*/
@ReactMethod
public void getDefaultAudience(Promise promise) {
promise.resolve(LoginManager.getInstance().getDefaultAudience().name().toLowerCase());
promise.resolve(LoginManager.getInstance().getDefaultAudience().name().toLowerCase(Locale.ROOT));
}

/**
Expand All @@ -116,7 +117,7 @@ public void getDefaultAudience(Promise promise) {
*/
@ReactMethod
public void setDefaultAudience(String defaultAudienceString) {
DefaultAudience defaultAudience = DefaultAudience.valueOf(defaultAudienceString.toUpperCase());
DefaultAudience defaultAudience = DefaultAudience.valueOf(defaultAudienceString.toUpperCase(Locale.ROOT));
LoginManager.getInstance().setDefaultAudience(defaultAudience);
}

Expand Down
4 changes: 3 additions & 1 deletion android/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import com.facebook.share.Sharer;
import com.facebook.share.widget.ShareDialog;

import java.util.Locale;

@ReactModule(name = FBShareDialogModule.NAME)
public class FBShareDialogModule extends FBSDKCallbackManagerBaseJavaModule {

Expand Down Expand Up @@ -96,7 +98,7 @@ public void show(ReadableMap shareContent, final Promise promise) {

@ReactMethod
public void setMode(String mode) {
mShareDialogMode = ShareDialog.Mode.valueOf(mode.toUpperCase());
mShareDialogMode = ShareDialog.Mode.valueOf(mode.toUpperCase(Locale.ROOT));
}

@ReactMethod
Expand Down
5 changes: 3 additions & 2 deletions android/src/main/java/com/facebook/reactnative/androidsdk/Utility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Set;

import androidx.annotation.Nullable;
Expand Down Expand Up @@ -145,12 +146,12 @@ public static GameRequestContent buildGameRequestContent(ReadableMap gameRequest
String actionType = getValueOrNull(gameRequestContentMap, "actionType");
if (actionType != null) {
gameRequestContentBuilder.setActionType(
GameRequestContent.ActionType.valueOf(actionType.toUpperCase()));
GameRequestContent.ActionType.valueOf(actionType.toUpperCase(Locale.ROOT)));
}
String filters = getValueOrNull(gameRequestContentMap, "filters");
if (filters != null) {
gameRequestContentBuilder.setFilters(
GameRequestContent.Filters.valueOf(filters.toUpperCase()));
GameRequestContent.Filters.valueOf(filters.toUpperCase(Locale.ROOT)));
}
gameRequestContentBuilder.setMessage(gameRequestContentMap.getString("message"));
if (gameRequestContentMap.hasKey("recipients")) {
Expand Down