Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[WEEX-342][android] ava.util.ConcurrentModificationException at java.util.ArrayList$ArrayListIterator.next(ArrayList.java:573)at #1268

Merged
merged 2 commits into from
Jun 14, 2018
Merged

[WEEX-342][android] ava.util.ConcurrentModificationException at java.util.ArrayList$ArrayListIterator.next(ArrayList.java:573)at #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0dacda
[WEEX-342][android] ava.util.ConcurrentModificationException at java…
Jun 14, 2018
c60016f
[WEEX-342][android] update release build tool, use right package name
Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,7 @@ private void applyEvents() {
if (getEvents() == null || getEvents().isEmpty())
return;
WXEvent event = getEvents();
int size = event.size();
for(int i=0; i<size; i++){
if(i >= event.size()){
break;
}
for(int i=0; i<event.size(); i++){
String type = event.get(i);
addEvent(type);
}
Expand Down Expand Up @@ -1450,7 +1446,9 @@ public void removeAllEvent() {
if (getEvents().size() < 1) {
return;
}
for (String event : getEvents()) {
WXEvent events = getEvents();
for (int i=0; i<events.size(); i++) {
String event = events.get(i);
if (event == null) {
continue;
}
Expand Down
3 changes: 2 additions & 1 deletion android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ public static boolean hasStopPropagation(WXComponent component){
if(event == null){
return false;
}
for(String type : event){
for(int i=0; i<event.size(); i++){
String type = event.get(i);
if(isStopPropagation(type)){
return true;
}
Expand Down
1 change: 1 addition & 0 deletions scripts/generate_apache_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ rsync -rvv --include-from=scripts/release_files.rules ./ $dest

#repackage
find $dest/android/sdk/src -type f -name '*.java' -exec sed -i '' 's/com\.taobao\.weex/org\.apache\.weex/g' {} \;
find $dest/android/sdk/src -type f -name 'AndroidManifest.xml' -exec sed -i '' 's/com\.taobao\.weex/org\.apache\.weex/g' {} \;

mkdir -p $dest/android/sdk/src/main/java/org
mkdir -p $dest/android/sdk/src/main/java/org/apache
Expand Down