Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(android): ShareDialog.setMode('native') throws in Turkish language #240

Merged
merged 3 commits into from Apr 30, 2022
Merged

fix(android): ShareDialog.setMode('native') throws in Turkish language #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c7e98
fix(android): ShareDialog.setMode throws in Turkish language when mod…
OrkhanAlikhanov Apr 30, 2022
cf634a5
Update with Locale.ROOT
OrkhanAlikhanov Apr 30, 2022
e81074f
fix(android): fix all uses of Locale-sensitive APIs to use Locale.ROOT
mikehardy Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions android/src/main/java/com/facebook/reactnative/androidsdk/FBLoginButtonManager.java
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
import com.facebook.react.uimanager.SimpleViewManager;
import com.facebook.react.uimanager.ThemedReactContext;

import java.util.Locale;

public class FBLoginButtonManager extends SimpleViewManager<RCTLoginButton> {

Expand All @@ -56,7 +57,7 @@ public void setLoginBehavior(RCTLoginButton loginButton, @Nullable String loginB
LoginBehavior behavior = LoginBehavior.NATIVE_WITH_FALLBACK;

if (loginBehavior != null) {
behavior = LoginBehavior.valueOf(loginBehavior.toUpperCase());
behavior = LoginBehavior.valueOf(loginBehavior.toUpperCase(Locale.ROOT));
}

loginButton.setLoginBehavior(behavior);
Expand All @@ -67,7 +68,7 @@ public void setDefaultAudience(RCTLoginButton loginButton, @Nullable String defa
DefaultAudience audience = DefaultAudience.FRIENDS;

if (defaultAudience != null) {
audience = DefaultAudience.valueOf(defaultAudience.toUpperCase());
audience = DefaultAudience.valueOf(defaultAudience.toUpperCase(Locale.ROOT));
}

loginButton.setDefaultAudience(audience);
Expand Down
9 changes: 5 additions & 4 deletions android/src/main/java/com/facebook/reactnative/androidsdk/FBLoginManagerModule.java
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion android/src/main/java/com/facebook/reactnative/androidsdk/FBShareDialogModule.java
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@

package com.facebook.reactnative.androidsdk;

import java.util.Locale;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
Expand Down Expand Up @@ -96,7 +97,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
Expand Up @@ -46,6 +46,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 @@ -143,12 +144,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