From c1304d938da9cd5016da0bded4d618c42efbd7e4 Mon Sep 17 00:00:00 2001 From: David Vacca Date: Thu, 23 Feb 2023 19:04:03 -0800 Subject: [PATCH] Fix lints warnings in RN Android Summary: Fix lints warnings in RN Android changelog: [internal] internal Reviewed By: RSNara Differential Revision: D43544495 fbshipit-source-id: 046cf00a99a443a2a515540e0029a19997247eb6 --- .../main/java/com/facebook/react/ReactFragment.java | 9 +++++---- .../reactperflogger/NativeModulePerfLogger.java | 3 +++ .../com/facebook/react/shell/MainReactPackage.java | 2 ++ .../react/views/text/ReactRawTextManager.java | 6 ++++-- .../ReactUnimplementedViewManager.java | 5 ++++- .../react/views/view/ReactDrawableHelper.java | 12 +++++++----- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java b/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java index 99e641f941b..4fdd46d53cb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java +++ b/ReactAndroid/src/main/java/com/facebook/react/ReactFragment.java @@ -16,6 +16,7 @@ import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.facebook.react.modules.core.PermissionAwareActivity; @@ -85,7 +86,7 @@ public class ReactFragment extends Fragment implements PermissionAwareActivity { @Override public View onCreateView( - LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { mReactDelegate.loadApp(); return mReactDelegate.getReactRootView(); } @@ -140,7 +141,7 @@ public class ReactFragment extends Fragment implements PermissionAwareActivity { @Override public void onRequestPermissionsResult( - int requestCode, String[] permissions, int[] grantResults) { + int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) { @@ -170,8 +171,8 @@ public class ReactFragment extends Fragment implements PermissionAwareActivity { /** Builder class to help instantiate a ReactFragment */ public static class Builder { - String mComponentName; - Bundle mLaunchOptions; + @Nullable String mComponentName; + @Nullable Bundle mLaunchOptions; public Builder() { mComponentName = null; diff --git a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/NativeModulePerfLogger.java b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/NativeModulePerfLogger.java index 266eb927e81..62938eb832f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/NativeModulePerfLogger.java +++ b/ReactAndroid/src/main/java/com/facebook/react/reactperflogger/NativeModulePerfLogger.java @@ -8,9 +8,12 @@ package com.facebook.react.perflogger; import com.facebook.jni.HybridData; +import com.facebook.jni.annotations.DoNotStrip; import com.facebook.soloader.SoLoader; public abstract class NativeModulePerfLogger { + @DoNotStrip + @SuppressWarnings("unused") private final HybridData mHybridData; private static volatile boolean sIsSoLibraryLoaded; diff --git a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java index 60a5be970d4..d12f79350a2 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java +++ b/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java @@ -7,6 +7,7 @@ package com.facebook.react.shell; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.react.TurboReactPackage; import com.facebook.react.animated.NativeAnimatedModule; @@ -148,6 +149,7 @@ public class MainReactPackage extends TurboReactPackage { } } + @NonNull @Override public List createViewManagers(ReactApplicationContext reactContext) { List viewManagers = new ArrayList<>(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java index 4a6901198f0..dd3eb48712a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.java @@ -8,6 +8,7 @@ package com.facebook.react.views.text; import android.view.View; +import androidx.annotation.NonNull; import com.facebook.react.common.annotations.VisibleForTesting; import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.ThemedReactContext; @@ -22,18 +23,19 @@ public class ReactRawTextManager extends ViewManager getShadowNodeClass() { diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/ReactUnimplementedViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/ReactUnimplementedViewManager.java index 80c4c1a3727..97ad4b22976 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/ReactUnimplementedViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/unimplementedview/ReactUnimplementedViewManager.java @@ -9,6 +9,7 @@ package com.facebook.react.views.unimplementedview; import static com.facebook.react.views.unimplementedview.ReactUnimplementedViewManager.REACT_CLASS; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.uimanager.ThemedReactContext; @@ -24,11 +25,13 @@ public class ReactUnimplementedViewManager extends ViewGroupManager= Build.VERSION_CODES.M - && drawableDescriptionDict.hasKey("rippleRadius") + && drawableDescriptionDict.hasKey(RIPPLE_RADIUS_KEY) && drawable instanceof RippleDrawable) { RippleDrawable rippleDrawable = (RippleDrawable) drawable; - double rippleRadius = drawableDescriptionDict.getDouble("rippleRadius"); + double rippleRadius = drawableDescriptionDict.getDouble(RIPPLE_RADIUS_KEY); rippleDrawable.setRadius((int) PixelUtil.toPixelFromDIP(rippleRadius)); } return drawable; @@ -106,9 +108,9 @@ public class ReactDrawableHelper { } private static @Nullable Drawable getMask(ReadableMap drawableDescriptionDict) { - if (!drawableDescriptionDict.hasKey("borderless") - || drawableDescriptionDict.isNull("borderless") - || !drawableDescriptionDict.getBoolean("borderless")) { + if (!drawableDescriptionDict.hasKey(BORDERLESS_KEY) + || drawableDescriptionDict.isNull(BORDERLESS_KEY) + || !drawableDescriptionDict.getBoolean(BORDERLESS_KEY)) { return new ColorDrawable(Color.WHITE); } return null;