Skip to content

Make ReactAccessibilityDelegate nullsafe #53068

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

Closed
Abbondanzo wants to merge 1 commit into from
Closed

Make ReactAccessibilityDelegate nullsafe #53068

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
38 changes: 25 additions & 13 deletions ...e/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

package com.facebook.react.uimanager;

import static com.facebook.infer.annotation.Assertions.assertNotNull;

import android.content.Context;
import android.graphics.Rect;
import android.os.Bundle;
Expand All @@ -25,6 +27,7 @@
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.RangeInfoCompat;
import androidx.core.view.accessibility.AccessibilityNodeProviderCompat;
import androidx.customview.widget.ExploreByTouchHelper;
import com.facebook.infer.annotation.Nullsafe;
import com.facebook.react.R;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Dynamic;
Expand All @@ -49,6 +52,7 @@
* Utility class that handles the addition of a "role" for accessibility to either a View or
* AccessibilityNodeInfo.
*/
@Nullsafe(Nullsafe.Mode.LOCAL)
public class ReactAccessibilityDelegate extends ExploreByTouchHelper {

public static final String TOP_ACCESSIBILITY_ACTION_EVENT = "topAccessibilityAction";
Expand All @@ -73,12 +77,15 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
@Nullable View mAccessibilityLabelledBy;

static {
sActionIdMap.put("activate", AccessibilityActionCompat.ACTION_CLICK.getId());
sActionIdMap.put("longpress", AccessibilityActionCompat.ACTION_LONG_CLICK.getId());
sActionIdMap.put("increment", AccessibilityActionCompat.ACTION_SCROLL_FORWARD.getId());
sActionIdMap.put("decrement", AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId());
sActionIdMap.put("expand", AccessibilityActionCompat.ACTION_EXPAND.getId());
sActionIdMap.put("collapse", AccessibilityActionCompat.ACTION_COLLAPSE.getId());
sActionIdMap.put("activate", assertNotNull(AccessibilityActionCompat.ACTION_CLICK).getId());
sActionIdMap.put(
"longpress", assertNotNull(AccessibilityActionCompat.ACTION_LONG_CLICK).getId());
sActionIdMap.put(
"increment", assertNotNull(AccessibilityActionCompat.ACTION_SCROLL_FORWARD).getId());
sActionIdMap.put(
"decrement", assertNotNull(AccessibilityActionCompat.ACTION_SCROLL_BACKWARD).getId());
sActionIdMap.put("expand", assertNotNull(AccessibilityActionCompat.ACTION_EXPAND).getId());
sActionIdMap.put("collapse", assertNotNull(AccessibilityActionCompat.ACTION_COLLAPSE).getId());
}

public ReactAccessibilityDelegate(
Expand All @@ -91,7 +98,9 @@ public ReactAccessibilityDelegate(
@Override
public void handleMessage(Message msg) {
View host = (View) msg.obj;
host.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
if (host != null) {
host.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED);
}
}
};

Expand Down Expand Up @@ -190,13 +199,14 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCo

if (accessibilityActions != null) {
for (int i = 0; i < accessibilityActions.size(); i++) {
final ReadableMap action = accessibilityActions.getMap(i);
if (!action.hasKey("name")) {
@Nullable final ReadableMap action = accessibilityActions.getMap(i);
if (action == null || !action.hasKey("name")) {
throw new IllegalArgumentException("Unknown accessibility action.");
}

String actionName = action.getString("name");
String actionLabel = action.hasKey("label") ? action.getString("label") : null;
// AccessibilityActionCompat actionLabel must be non-null
String actionLabel = action.hasKey("label") ? assertNotNull(action.getString("label")) : "";
int actionId;

if (sActionIdMap.containsKey(actionName)) {
Expand Down Expand Up @@ -336,8 +346,9 @@ public WritableMap getEventData() {
(AccessibilityRole) host.getTag(R.id.accessibility_role);
final ReadableMap accessibilityValue = (ReadableMap) host.getTag(R.id.accessibility_value);
if (accessibilityRole == AccessibilityRole.ADJUSTABLE
&& (action == AccessibilityActionCompat.ACTION_SCROLL_FORWARD.getId()
|| action == AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId())) {
&& (action == assertNotNull(AccessibilityActionCompat.ACTION_SCROLL_FORWARD).getId()
|| action
== assertNotNull(AccessibilityActionCompat.ACTION_SCROLL_BACKWARD).getId())) {
if (accessibilityValue != null && !accessibilityValue.hasKey("text")) {
scheduleAccessibilityEventSender(host);
}
Expand Down Expand Up @@ -631,7 +642,8 @@ public static boolean isActionableForAccessibility(@Nullable AccessibilityNodeIn
return true;
}

final List actionList = node.getActionList();
final List<AccessibilityNodeInfoCompat.AccessibilityActionCompat> actionList =
assertNotNull(node.getActionList());
return actionList.contains(AccessibilityNodeInfoCompat.ACTION_CLICK)
|| actionList.contains(AccessibilityNodeInfoCompat.ACTION_LONG_CLICK)
|| actionList.contains(AccessibilityNodeInfoCompat.ACTION_FOCUS);
Expand Down
Loading