Fix scroll handle NPE after document loading error

Update README and CHANGELOG
Update version

Author: barteksc

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.3 (2016-08-30)
+* Fix scroll handle NPE after document loading error
+
 ## 2.0.2 (2016-08-27)
 * Fix exceptions caused by improperly finishing rendering task
 

README.md

@@ -14,8 +14,11 @@ Licensed under Apache License 2.0.
 * added scroll handle as a replacement for scrollbar
 
 2.0.1 fixes NPE when onDetachFromWindow is called.
+
 2.0.2 fixes exceptions caused by improperly finishing rendering task.
 
+2.0.3 fixes scroll handle NPE after document loading error
+
 ## Changes in 2.0 API
 * `Configurator#defaultPage(int)` and `PDFView#jumpTo(int)` now require page index (i.e. starting from 0)
 * `OnPageChangeListener#onPageChanged(int, int)` is called with page index (i.e. starting from 0)
@@ -29,7 +32,7 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:2.0.2'`
+`compile 'com.github.barteksc:android-pdf-viewer:2.0.3'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 

android-pdf-viewer/build.gradle

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

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

@@ -446,7 +446,7 @@ public void recycle() {
         // Clear caches
         cacheManager.recycle();
 
-        if (scrollHandle != null) {
+        if (scrollHandle != null && state != State.ERROR) {
             scrollHandle.destroyLayout();
         }
 
@@ -644,6 +644,7 @@ public void loadPages() {
      * Called when the PDF is loaded
      */
     public void loadComplete(PdfDocument pdfDocument) {
+        state = State.LOADED;
         this.documentPageCount = pdfiumCore.getPageCount(pdfDocument);
 
         int firstPageIdx = 0;
@@ -656,7 +657,6 @@ public void loadComplete(PdfDocument pdfDocument) {
         pdfiumCore.openPage(pdfDocument, firstPageIdx);
         this.pageWidth = pdfiumCore.getPageWidth(pdfDocument, firstPageIdx);
         this.pageHeight = pdfiumCore.getPageHeight(pdfDocument, firstPageIdx);
-        state = State.LOADED;
         calculateOptimalWidthAndHeight();
 
         pagesLoader = new PagesLoader(this);
@@ -676,6 +676,7 @@ public void loadComplete(PdfDocument pdfDocument) {
     }
 
     public void loadError(Throwable t) {
+        state = State.ERROR;
         recycle();
         invalidate();
         if (this.onErrorListener != null) {
@@ -1129,7 +1130,7 @@ public Configurator fromUri(Uri uri) {
         return new Configurator(uri.toString(), false);
     }
 
-    private enum State {DEFAULT, LOADED, SHOWN}
+    private enum State {DEFAULT, LOADED, SHOWN, ERROR}
 
     public class Configurator {