From 1948659f3678abdfad3b81d11964b181a702be0d Mon Sep 17 00:00:00 2001 From: burt Date: Sat, 27 Aug 2016 21:59:19 +0900 Subject: [PATCH] prevent IllegalArgumentException (pointerIndex out of range). see https://github.com/chrisbanes/PhotoView/issues/31 --- .idea/compiler.xml | 2 +- .idea/{vcs.xml => encodings.xml} | 4 +- .idea/gradle.xml | 8 +- .idea/libraries/appcompat_v7_23_0_1.xml | 4 +- .idea/libraries/hamcrest_core_1_3.xml | 11 + .idea/libraries/junit_4_12.xml | 11 + .../libraries/support_annotations_23_0_1.xml | 4 +- .idea/libraries/support_v4_23_0_1.xml | 6 +- .idea/misc.xml | 18 +- .idea/workspace.xml | 821 ++++++------------ app/app.iml | 38 +- lockablewidgets/build.gradle | 6 +- lockablewidgets/lockablewidgets.iml | 35 +- .../lockablewidgets/LockableViewPager.java | 16 +- 14 files changed, 379 insertions(+), 605 deletions(-) rename .idea/{vcs.xml => encodings.xml} (52%) create mode 100644 .idea/libraries/hamcrest_core_1_3.xml create mode 100644 .idea/libraries/junit_4_12.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9a8b7e5..96cc43e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,7 +1,6 @@ - diff --git a/.idea/libraries/appcompat_v7_23_0_1.xml b/.idea/libraries/appcompat_v7_23_0_1.xml index c37204d..66c52ab 100644 --- a/.idea/libraries/appcompat_v7_23_0_1.xml +++ b/.idea/libraries/appcompat_v7_23_0_1.xml @@ -2,6 +2,7 @@ + @@ -9,7 +10,8 @@ - + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml new file mode 100644 index 0000000..157e3f3 --- /dev/null +++ b/.idea/libraries/hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml new file mode 100644 index 0000000..305df30 --- /dev/null +++ b/.idea/libraries/junit_4_12.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_0_1.xml b/.idea/libraries/support_annotations_23_0_1.xml index a8b39c9..d8ec15a 100644 --- a/.idea/libraries/support_annotations_23_0_1.xml +++ b/.idea/libraries/support_annotations_23_0_1.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_0_1.xml b/.idea/libraries/support_v4_23_0_1.xml index 3243c7d..127bfe9 100644 --- a/.idea/libraries/support_v4_23_0_1.xml +++ b/.idea/libraries/support_v4_23_0_1.xml @@ -2,15 +2,17 @@ + - + - + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4716600..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,26 +37,10 @@ - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 56e10db..861f3a1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,7 @@ - + - - + + - - - - - + + @@ -45,27 +42,7 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -74,18 +51,12 @@ - - + + - - - - - - - - - + + + @@ -1929,7 +1900,7 @@ - - - @@ -2389,7 +2356,7 @@ - + @@ -2399,6 +2366,8 @@ + + @@ -2428,248 +2397,55 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - + + + - - - - @@ -2698,19 +2474,25 @@ - + + - - - + + @@ -2724,9 +2506,9 @@ - + + - - localhost - 5050 - - - 1444968640269 + + 1472301772517 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -2892,7 +2645,7 @@ - + @@ -2902,16 +2655,8 @@ - - - - - - - - - - + + diff --git a/app/app.iml b/app/app.iml index 6f071db..c893c33 100644 --- a/app/app.iml +++ b/app/app.iml @@ -12,10 +12,7 @@ - + @@ -50,6 +47,13 @@ + + + + + + + @@ -64,34 +68,30 @@ + + + + + + + - - - - - - - - - - - - - + - - + + + \ No newline at end of file diff --git a/lockablewidgets/build.gradle b/lockablewidgets/build.gradle index f0e6039..f2e81f6 100644 --- a/lockablewidgets/build.gradle +++ b/lockablewidgets/build.gradle @@ -15,7 +15,7 @@ publish { userOrg = 'skyfe79' groupId = 'kr.pe.burt.android.lib' artifactId = 'lockablewidgets' - publishVersion = '0.0.1' + publishVersion = '0.0.2' desc = 'LockableWidgets is a collection of lockable widgets for Android. It contains LockableScrollView and LockableViewPager.' website = 'https://github.com/skyfe79/LockableWidgets' issueTracker = "${website}/issues" @@ -29,8 +29,8 @@ android { defaultConfig { minSdkVersion 9 targetSdkVersion 23 - versionCode 1 - versionName "0.0.1" + versionCode 2 + versionName "0.0.2" } buildTypes { release { diff --git a/lockablewidgets/lockablewidgets.iml b/lockablewidgets/lockablewidgets.iml index 022d83a..710ab19 100644 --- a/lockablewidgets/lockablewidgets.iml +++ b/lockablewidgets/lockablewidgets.iml @@ -12,10 +12,7 @@ - + @@ -51,6 +48,13 @@ + + + + + + + @@ -65,22 +69,21 @@ + + + + + + + + - - - - - - - - - - + @@ -89,8 +92,10 @@ - + + + \ No newline at end of file diff --git a/lockablewidgets/src/main/java/kr/pe/burt/android/lib/lockablewidgets/LockableViewPager.java b/lockablewidgets/src/main/java/kr/pe/burt/android/lib/lockablewidgets/LockableViewPager.java index 58ca262..7c388b8 100644 --- a/lockablewidgets/src/main/java/kr/pe/burt/android/lib/lockablewidgets/LockableViewPager.java +++ b/lockablewidgets/src/main/java/kr/pe/burt/android/lib/lockablewidgets/LockableViewPager.java @@ -25,16 +25,24 @@ public LockableViewPager(Context context, AttributeSet attrs) { @Override public boolean onTouchEvent(MotionEvent ev) { - if(swipeable) { - return super.onTouchEvent(ev); + try { + if (swipeable) { + return super.onTouchEvent(ev); + } + } catch (IllegalArgumentException e) { + } return false; } @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - if(swipeable) { - return super.onInterceptTouchEvent(ev); + try { + if (swipeable) { + return super.onInterceptTouchEvent(ev); + } + } catch (IllegalArgumentException e) { + } return false; }