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

[pull] master from facebook:master #262

Merged
merged 1 commit into from
Oct 7, 2020
Merged

[pull] master from facebook:master #262

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
7 changes: 3 additions & 4 deletions ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package com.facebook.react.bridge;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.util.ArrayList;

/**
Expand All @@ -27,13 +26,13 @@ public interface ReadableArray {

int getInt(int index);

@Nullable
@NonNull
String getString(int index);

@Nullable
@NonNull
ReadableArray getArray(int index);

@Nullable
@NonNull
ReadableMap getMap(int index);

@NonNull
Expand Down
6 changes: 3 additions & 3 deletions ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@ public int getInt(int index) {
}

@Override
public @Nullable String getString(int index) {
public @NonNull String getString(int index) {
return (String) getLocalArray()[index];
}

@Override
public @Nullable ReadableNativeArray getArray(int index) {
public @NonNull ReadableNativeArray getArray(int index) {
return (ReadableNativeArray) getLocalArray()[index];
}

@Override
public @Nullable ReadableNativeMap getMap(int index) {
public @NonNull ReadableNativeMap getMap(int index) {
return (ReadableNativeMap) getLocalArray()[index];
}

Expand Down