miomin closed pull request #1379: * [Android] Fix some
ConcurrentModificationException
URL: https://github.com/apache/incubator-weex/pull/1379
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index 14dc743974..c6adf8064a 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -289,8 +289,14 @@ public void onScrollStateChanged(RecyclerView
recyclerView, int newState) {
super.onScrollStateChanged(recyclerView, newState);
List<OnWXScrollListener> listeners =
getInstance().getWXScrollListeners();
- if (listeners != null && listeners.size() > 0) {
- for (OnWXScrollListener listener : listeners) {
+ int size;
+ OnWXScrollListener listener;
+ if (listeners != null && (size = listeners.size()) > 0) {
+ for (int i=0; i<size; ++i) {
+ if(i >= listeners.size()){
+ break;
+ }
+ listener = listeners.get(i);
if (listener != null) {
View topView = recyclerView.getChildAt(0);
if (topView != null) {
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
index e6818e1681..9f66c03d9c 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
@@ -767,8 +767,17 @@ public boolean
removeOnRefreshOffsetChangedListener(@Nullable OnRefreshOffsetCha
}
private void notifyOnRefreshOffsetChangedListener(int verticalOffset) {
- for(OnRefreshOffsetChangedListener listener :
mRefreshOffsetChangedListeners) {
- listener.onOffsetChanged(verticalOffset);
+ int size = mRefreshOffsetChangedListeners.size();
+ OnRefreshOffsetChangedListener listener;
+ for (int i=0; i<size; i++) {
+ if(i >= mRefreshOffsetChangedListeners.size()){
+ break;
+ }
+ listener = mRefreshOffsetChangedListeners.get(i);
+
+ if (listener != null) {
+ listener.onOffsetChanged(verticalOffset);
+ }
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
