Add fromUri method

Update PdfiumAndroid to 1.0.3
Update README
Update version

Author: barteksc

README.md

@@ -6,11 +6,20 @@ Library for displaying PDF documents on Android, with `animations`, `gestures`,
 It is based on [PdfiumAndroid](https://github.com/barteksc/PdfiumAndroid) for decoding PDF files. Works on API 11 and higher.
 Licensed under Apache License 2.0.
 
+## What's new in 1.1.0?
+* added method `pdfView.fromUri(Uri)` for opening files from content providers
+* updated PdfiumAndroid to 1.0.3, which should fix bug with exception
+* updated sample with demonstration of `fromUri()` method
+* some minor fixes
+
+Next release is coming soon, it will introduce continuous scroll through whole document
+and some incompatibilities with current API (only few small).
+
 ## Installation
 
 Add to _build.gradle_:
 
-`compile 'com.github.barteksc:android-pdf-viewer:1.0.0'`
+`compile 'com.github.barteksc:android-pdf-viewer:1.1.0'`
 
 Library is available in jcenter repository, probably it'll be in Maven Central soon.
 
@@ -25,21 +34,25 @@ Library is available in jcenter repository, probably it'll be in Maven Central s
 
 ## Load a PDF file
 
+All available options with default values:
 ``` java
 pdfView.fromAsset(pdfName)
-    .pages(0, 2, 1, 3, 3, 3)
+    .pages(0, 2, 1, 3, 3, 3) //all pages are displayed by default
+    .enableSwipe(true)
+    .enableDoubletap(true)
+    .swipeVertical(false)
     .defaultPage(1)
     .showMinimap(false)
-    .enableSwipe(true)
     .onDraw(onDrawListener)
     .onLoad(onLoadCompleteListener)
     .onPageChange(onPageChangeListener)
     .onError(onErrorListener)
     .load();
 ```
 
-* ```pages``` is optional, it allows you to filter and order the pages of the PDF as you need
-* ```onDraw``` is also optional, and allows you to draw something on a provided canvas, above the current page
+* `enableSwipe` is optional, it allows you to block changing pages using swipe
+* `pages` is optional, it allows you to filter and order the pages of the PDF as you need
+* `onDraw` is also optional, and allows you to draw something on a provided canvas, above the current page
 
 ## Show scrollbar
 

android-pdf-viewer/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
     gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
 
-    libraryVersion = '1.0.0'
+    libraryVersion = '1.1.0'
 
     developerId = 'barteksc'
     developerName = 'Bartosz Schiller'
@@ -32,13 +32,13 @@ android {
         minSdkVersion 11
         targetSdkVersion 23
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.1.0"
     }
 
 }
 
 dependencies {
-    compile 'com.github.barteksc:pdfium-android:1.0.2'
+    compile 'com.github.barteksc:pdfium-android:1.0.3'
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

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

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Bartosz Schiller
- * <p>
+ * <p/>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
+ * <p/>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,6 @@
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.IOException;
-import java.net.URI;
 
 class DecodingAsyncTask extends AsyncTask<Void, Void, Throwable> {
 
@@ -55,7 +54,7 @@ public DecodingAsyncTask(String path, boolean isAsset, PDFView pdfView, PdfiumCo
     @Override
     protected Throwable doInBackground(Void... params) {
         try {
-            if(isAsset) {
+            if (isAsset) {
                 path = FileUtils.fileFromAsset(context, path).getAbsolutePath();
             }
             pdfDocument = pdfiumCore.newDocument(getSeekableFileDescriptor(path));
@@ -74,8 +73,12 @@ protected FileDescriptor getSeekableFileDescriptor(String path) throws IOExcepti
             return pfd.getFileDescriptor();
         }
 
-        URI uri = URI.create(String.format("file://%s", path));
-        pfd = context.getContentResolver().openFileDescriptor(Uri.parse(uri.toString()), "rw");
+        if (!path.contains("://")) {
+            path = String.format("file://%s", path);
+        }
+
+        Uri uri = Uri.parse(path);
+        pfd = context.getContentResolver().openFileDescriptor(uri, "r");
 
         if (pfd == null) {
             throw new IOException("Cannot get FileDescriptor for " + path);

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

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Bartosz Schiller
- * <p/>
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p/>
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,6 +24,7 @@
 import android.graphics.PointF;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -279,7 +280,6 @@ public PDFView(Context context, AttributeSet set) {
         animationManager = new AnimationManager(this);
         dragPinchManager = new DragPinchManager(this);
 
-
         paint = new Paint();
         debugPaint = new Paint();
         debugPaint.setStyle(Style.STROKE);
@@ -352,10 +352,11 @@ void showPage(int pageNb) {
 
         // Reset the zoom and center the page on the screen
         resetZoom();
-        if (swipeVertical)
+        if (swipeVertical) {
             animationManager.startYAnimation(currentYOffset, calculateCenterOffsetForPage(pageNb));
-        else
+        } else {
             animationManager.startXAnimation(currentXOffset, calculateCenterOffsetForPage(pageNb));
+        }
         loadPages();
 
         if (scrollBar != null) {
@@ -410,8 +411,9 @@ public void recycle() {
         if (pdfiumCore != null && pdfDocument != null) {
             pdfiumCore.closeDocument(pdfDocument);
         }
-        openedPages.clear();
 
+        openedPages.clear();
+        pdfDocument = null;
         recycled = true;
         state = State.DEFAULT;
     }
@@ -611,7 +613,7 @@ public void loadPages() {
 
     /**
      * Render a page, creating 1 to <i>nbOfPartsLoadable</i> page parts. <br><br>
-     * <p>
+     * <p/>
      * This is one of the trickiest method of this library. It finds
      * the DocumentPage associated with the given UserPage, loads its
      * thumbnail, cut this page into 256x256 blocs considering the
@@ -959,7 +961,6 @@ public void moveTo(float offsetX, float offsetY) {
                 }
 
             } else {
-
                 float maxY = calculateCenterOffsetForPage(currentFilteredPage + 1);
                 float minY = calculateCenterOffsetForPage(currentFilteredPage - 1);
                 if (offsetY < maxY) {
@@ -995,7 +996,6 @@ public void moveTo(float offsetX, float offsetY) {
                 }
 
             } else {
-
                 float maxX = calculateCenterOffsetForPage(currentFilteredPage + 1);
                 float minX = calculateCenterOffsetForPage(currentFilteredPage - 1);
                 if (offsetX < maxX) {
@@ -1088,6 +1088,10 @@ public float getOptimalPageWidth() {
         return optimalPageWidth;
     }
 
+    public float getOptimalPageHeight() {
+        return optimalPageHeight;
+    }
+
     private void setUserWantsMinimap(boolean userWantsMinimap) {
         this.userWantsMinimap = userWantsMinimap;
     }
@@ -1166,11 +1170,19 @@ public Configurator fromAsset(String assetName) {
      * Use a file as the pdf source
      */
     public Configurator fromFile(File file) {
-        if (!file.exists())
-            throw new FileNotFoundException(file.getAbsolutePath() + "does not exist.");
+        if (!file.exists()) {
+            throw new FileNotFoundException(file.getAbsolutePath() + " does not exist.");
+        }
         return new Configurator(file.getAbsolutePath(), false);
     }
 
+    /**
+     * Use URI as the pdf source, for use with content providers
+     */
+    public Configurator fromUri(Uri uri) {
+        return new Configurator(uri.toString(), false);
+    }
+
     private enum State {DEFAULT, LOADED, SHOWN}
 
     public class Configurator {