Fix bug preventing OnErrorListener from being called

Author: barteksc

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.0.0-beta.3 (2017-11-18)
+* Fix bug preventing `OnErrorListener` from being called
+
 ## 3.0.0-beta.2 (2017-11-15)
 * Fix rendering with maximum zoom
 * Improve fit policies

README.md

@@ -18,6 +18,8 @@ Licensed under Apache License 2.0.
 
 3.0.0-beta.2 fixes rendering with maximum zoom, improves fit policies and updates PdfiumAndroid to 1.8.1
 
+3.0.0-beta.3 fixes bug preventing `OnErrorListener` from being called
+
 ## Changes in 3.0 API
 * Replaced `Contants.PRELOAD_COUNT` with `PRELOAD_OFFSET`
 * Removed `PDFView#fitToWidth()` (variant without arguments)
@@ -29,7 +31,7 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.2'`
+`compile 'com.github.barteksc:android-pdf-viewer:3.0.0-beta.3'`
 
 or if you want to use more stable version:
 

android-pdf-viewer/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
     gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
 
-    libraryVersion = '3.0.0-beta.2'
+    libraryVersion = '3.0.0-beta.3'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,7 +32,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1
-        versionName "3.0.0-beta.2"
+        versionName "3.0.0-beta.3"
     }
 
 }

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/PDFView.java

@@ -692,9 +692,13 @@ void loadComplete(PdfFile pdfFile) {
 
     void loadError(Throwable t) {
         state = State.ERROR;
+        // store reference, because callbacks will be cleared in recycle() method
+        OnErrorListener onErrorListener = callbacks.getOnError();
         recycle();
         invalidate();
-        if (!callbacks.callOnError(t)) {
+        if (onErrorListener != null) {
+            onErrorListener.onError(t);
+        } else {
             Log.e("PDFView", "load pdf error", t);
         }
     }

android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/listener/Callbacks.java

@@ -83,12 +83,8 @@ public void setOnError(OnErrorListener onErrorListener) {
         this.onErrorListener = onErrorListener;
     }
 
-    public boolean callOnError(Throwable error) {
-        if (onErrorListener != null) {
-            onErrorListener.onError(error);
-            return true;
-        }
-        return false;
+    public OnErrorListener getOnError() {
+        return onErrorListener;
     }
 
     public void setOnPageError(OnPageErrorListener onPageErrorListener) {