Skip to content

Add API 26 check to ReactScrollViewHelper #53688

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

Add API 26 check to ReactScrollViewHelper #53688

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
20 changes: 18 additions & 2 deletions ...ative/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,15 @@ public object ReactScrollViewHelper {
@RequiresApi(Build.VERSION_CODES.N)
@JvmStatic
public fun removeScrollListener(listener: ScrollListener) {
scrollListeners.removeIf { it.get() == null || it.get() == listener }
// Avoid using removeIf, only available in API 26+
val toRemove = ArrayList<WeakReference<ScrollListener>>()
for (ref in scrollListeners) {
val target = ref.get()
if (target == null || target == listener) {
toRemove.add(ref)
}
}
scrollListeners.removeAll(toRemove)
}

@JvmStatic
Expand All @@ -256,7 +264,15 @@ public object ReactScrollViewHelper {
@RequiresApi(Build.VERSION_CODES.N)
@JvmStatic
public fun removeLayoutChangeListener(listener: LayoutChangeListener) {
layoutChangeListeners.removeIf { it.get() == null || it.get() == listener }
// Avoid using removeIf, only available in API 26+
val toRemove = ArrayList<WeakReference<LayoutChangeListener>>()
for (ref in layoutChangeListeners) {
val target = ref.get()
if (target == null || target == listener) {
toRemove.add(ref)
}
}
layoutChangeListeners.removeAll(toRemove)
}

/**
Expand Down
Loading