diff --git a/app/build.gradle b/app/build.gradle index 5152b8840..fba22db76 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,8 +39,8 @@ android { minSdkVersion 16 targetSdkVersion 23 testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - versionCode 3 - versionName "0.1.2" + versionCode 4 + versionName "0.1.3" buildConfigField "String", "COMMIT_COUNT", "\"${getCommitCount()}\"" buildConfigField "String", "COMMIT_SHA", "\"${getGitSha()}\"" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 75fa2308b..7b74ead4c 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -8,9 +8,9 @@ # OkHttp -keepattributes Signature -keepattributes *Annotation* --keep class com.squareup.okhttp.** { *; } --keep interface com.squareup.okhttp.** { *; } --dontwarn com.squareup.okhttp.** +-keep class okhttp3.** { *; } +-keep interface okhttp3.** { *; } +-dontwarn okhttp3.** -dontwarn okio.** # Okio diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java index acbec7d49..d842ca360 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/horizontal/HorizontalPager.java @@ -47,7 +47,7 @@ public class HorizontalPager extends ViewPager implements Pager { return super.onInterceptTouchEvent(ev); } catch (IllegalArgumentException e) { - return true; + return false; } } @@ -82,7 +82,7 @@ public class HorizontalPager extends ViewPager implements Pager { return super.onTouchEvent(ev); } catch (IllegalArgumentException e) { - return true; + return false; } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java index fc9fc563c..ec4ec4790 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/vertical/VerticalPager.java @@ -46,7 +46,7 @@ public class VerticalPager extends VerticalViewPagerImpl implements Pager { return super.onInterceptTouchEvent(ev); } catch (IllegalArgumentException e) { - return true; + return false; } } @@ -81,7 +81,7 @@ public class VerticalPager extends VerticalViewPagerImpl implements Pager { return super.onTouchEvent(ev); } catch (IllegalArgumentException e) { - return true; + return false; } }