Fix exceptions caused by improperly finishing rendering task

barteksc · barteksc · commit ce9d03ac1867 · 2016-08-27T01:52:04.000+02:00
Update README and CHANGELOG
Update version
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.2 (2016-08-27)
+* Fix exceptions caused by improperly finishing rendering task
+
 ## 2.0.1 (2016-08-16)
 * Fix NPE when onDetachFromWindow is called
 
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ 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.
 
 ## Changes in 2.0 API
 * `Configurator#defaultPage(int)` and `PDFView#jumpTo(int)` now require page index (i.e. starting from 0)
@@ -28,7 +29,7 @@ Licensed under Apache License 2.0.
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:2.0.1'`
+`compile 'com.github.barteksc:android-pdf-viewer:2.0.2'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 
diff --git a/android-pdf-viewer/build.gradle b/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.1'
+    libraryVersion = '2.0.2'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,7 +32,7 @@ android {
         minSdkVersion 11
         targetSdkVersion 23
         versionCode 1
-        versionName "2.0.1"
+        versionName "2.0.2"
     }
 
 }
diff --git a/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/RenderingAsyncTask.java b/android-pdf-viewer/src/main/java/com/github/barteksc/pdfviewer/RenderingAsyncTask.java
@@ -75,7 +75,9 @@ protected Void doInBackground(Void... params) {
                 //it is very rare case, but sometimes null can appear
                 if (task != null) {
                     PagePart part = proceed(task);
-                    if (renderingTasks.remove(task)) {
+                    if (part == null) {
+                        break;
+                    } else if (renderingTasks.remove(task)) {
                         publishProgress(part);
                     } else {
                         part.getRenderedBitmap().recycle();
@@ -120,9 +122,14 @@ private PagePart proceed(RenderingTask renderingTask) {
         Bitmap render = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
         calculateBounds(w, h, renderingTask.bounds);
 
-        pdfiumCore.renderPageBitmap(pdfDocument, render, renderingTask.page,
-                roundedRenderBounds.left, roundedRenderBounds.top,
-                roundedRenderBounds.width(), roundedRenderBounds.height(), renderingTask.annotationRendering);
+        if (!isCancelled()) {
+            pdfiumCore.renderPageBitmap(pdfDocument, render, renderingTask.page,
+                    roundedRenderBounds.left, roundedRenderBounds.top,
+                    roundedRenderBounds.width(), roundedRenderBounds.height(), renderingTask.annotationRendering);
+        } else {
+            render.recycle();
+            return null;
+        }
 
         if (!renderingTask.bestQuality) {
             Bitmap cpy = render.copy(Bitmap.Config.RGB_565, false);

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ ext {`
`13`	`13`	`siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'`
`14`	`14`	`gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'`
`15`	`15`
`16`		`- libraryVersion = '2.0.1'`
	`16`	`+ libraryVersion = '2.0.2'`
`17`	`17`
`18`	`18`	`developerId = 'barteksc'`
`19`	`19`	`developerName = 'Bartosz Schiller'`
`@@ -32,7 +32,7 @@ android {`
`32`	`32`	`minSdkVersion 11`
`33`	`33`	`targetSdkVersion 23`
`34`	`34`	`versionCode 1`
`35`		`- versionName "2.0.1"`
	`35`	`+ versionName "2.0.2"`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`}`