Add mechanism for providing pdf documents from different sources

Add shorthand methods for using document sources
Deprecate FileNotFoundException and remove all usages
Add util method toByteArray
Update PdfiumAndroid version

Author: barteksc

android-pdf-viewer/build.gradle

@@ -38,7 +38,7 @@ android {
 }
 
 dependencies {
-    compile 'com.github.barteksc:pdfium-android:1.4.0'
+    compile 'com.github.barteksc:pdfium-android:1.5.0'
 }
 
 apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'

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

@@ -16,78 +16,43 @@
 package com.github.barteksc.pdfviewer;
 
 import android.content.Context;
-import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.ParcelFileDescriptor;
 
-import com.github.barteksc.pdfviewer.util.FileUtils;
+import com.github.barteksc.pdfviewer.source.DocumentSource;
 import com.shockwave.pdfium.PdfDocument;
 import com.shockwave.pdfium.PdfiumCore;
 
-import java.io.File;
-import java.io.IOException;
-
 class DecodingAsyncTask extends AsyncTask<Void, Void, Throwable> {
 
     private boolean cancelled;
 
-    private String path;
-
-    private boolean isAsset;
-
     private PDFView pdfView;
 
     private Context context;
     private PdfiumCore pdfiumCore;
     private PdfDocument pdfDocument;
     private String password;
+    private DocumentSource docSource;
 
-    public DecodingAsyncTask(String path, boolean isAsset, String password, PDFView pdfView, PdfiumCore pdfiumCore) {
+    public DecodingAsyncTask(DocumentSource docSource, String password, PDFView pdfView, PdfiumCore pdfiumCore) {
+        this.docSource = docSource;
         this.cancelled = false;
         this.pdfView = pdfView;
-        this.isAsset = isAsset;
         this.password = password;
         this.pdfiumCore = pdfiumCore;
-        this.path = path;
         context = pdfView.getContext();
     }
 
     @Override
     protected Throwable doInBackground(Void... params) {
         try {
-            if (isAsset) {
-                path = FileUtils.fileFromAsset(context, path).getAbsolutePath();
-            }
-            pdfDocument = pdfiumCore.newDocument(getSeekableFileDescriptor(path), password);
+            pdfDocument = docSource.createDocument(context, pdfiumCore, password);
             return null;
         } catch (Throwable t) {
             return t;
         }
     }
 
-    protected ParcelFileDescriptor getSeekableFileDescriptor(String path) throws IOException {
-        ParcelFileDescriptor pfd;
-
-        File pdfCopy = new File(path);
-        if (pdfCopy.exists()) {
-            pfd = ParcelFileDescriptor.open(pdfCopy, ParcelFileDescriptor.MODE_READ_ONLY);
-            return pfd;
-        }
-
-        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);
-        }
-
-        return pfd;
-    }
-
     @Override
     protected void onPostExecute(Throwable t) {
         if (t != null) {

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

@@ -31,14 +31,19 @@
 import android.util.Log;
 import android.widget.RelativeLayout;
 
-import com.github.barteksc.pdfviewer.exception.FileNotFoundException;
 import com.github.barteksc.pdfviewer.listener.OnDrawListener;
 import com.github.barteksc.pdfviewer.listener.OnErrorListener;
 import com.github.barteksc.pdfviewer.listener.OnLoadCompleteListener;
 import com.github.barteksc.pdfviewer.listener.OnPageChangeListener;
 import com.github.barteksc.pdfviewer.listener.OnPageScrollListener;
 import com.github.barteksc.pdfviewer.model.PagePart;
 import com.github.barteksc.pdfviewer.scroll.ScrollHandle;
+import com.github.barteksc.pdfviewer.source.AssetSource;
+import com.github.barteksc.pdfviewer.source.ByteArraySource;
+import com.github.barteksc.pdfviewer.source.DocumentSource;
+import com.github.barteksc.pdfviewer.source.FileSource;
+import com.github.barteksc.pdfviewer.source.InputStreamSource;
+import com.github.barteksc.pdfviewer.source.UriSource;
 import com.github.barteksc.pdfviewer.util.ArrayUtils;
 import com.github.barteksc.pdfviewer.util.Constants;
 import com.github.barteksc.pdfviewer.util.MathUtils;
@@ -66,7 +71,7 @@
  * - DocumentPage = A page of the PDF document.
  * - UserPage = A page as defined by the user.
  * By default, they're the same. But the user can change the pages order
- * using {@link #load(String, boolean, String, OnLoadCompleteListener, OnErrorListener, int[])}. In this
+ * using {@link #load(DocumentSource, String, OnLoadCompleteListener, OnErrorListener, int[])}. In this
  * particular case, a userPage of 5 can refer to a documentPage of 17.
  */
 public class PDFView extends RelativeLayout {
@@ -279,11 +284,11 @@ public PDFView(Context context, AttributeSet set) {
         setWillNotDraw(false);
     }
 
-    private void load(String path, boolean isAsset, String password, OnLoadCompleteListener listener, OnErrorListener onErrorListener) {
-        load(path, isAsset, password, listener, onErrorListener, null);
+    private void load(DocumentSource docSource, String password, OnLoadCompleteListener listener, OnErrorListener onErrorListener) {
+        load(docSource, password, listener, onErrorListener, null);
     }
 
-    private void load(String path, boolean isAsset, String password, OnLoadCompleteListener onLoadCompleteListener, OnErrorListener onErrorListener, int[] userPages) {
+    private void load(DocumentSource docSource, String password, OnLoadCompleteListener onLoadCompleteListener, OnErrorListener onErrorListener, int[] userPages) {
 
         if (!recycled) {
             throw new IllegalStateException("Don't call load on a PDF View without recycling it first.");
@@ -301,7 +306,7 @@ private void load(String path, boolean isAsset, String password, OnLoadCompleteL
 
         recycled = false;
         // Start decoding document
-        decodingAsyncTask = new DecodingAsyncTask(path, isAsset, password, this, pdfiumCore);
+        decodingAsyncTask = new DecodingAsyncTask(docSource, password, this, pdfiumCore);
         decodingAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
@@ -1108,47 +1113,48 @@ public List<PdfDocument.Bookmark> getTableOfContents() {
      * Use an asset file as the pdf source
      */
     public Configurator fromAsset(String assetName) {
-        InputStream stream = null;
-        try {
-            stream = getContext().getAssets().open(assetName);
-            return new Configurator(assetName, true);
-        } catch (IOException e) {
-            throw new FileNotFoundException(assetName + " does not exist.", e);
-        } finally {
-            try {
-                if (stream != null) {
-                    stream.close();
-                }
-            } catch (IOException e) {
-
-            }
-        }
+        return new Configurator(new AssetSource(assetName));
     }
 
     /**
      * Use a file as the pdf source
      */
     public Configurator fromFile(File file) {
-        if (!file.exists()) {
-            throw new FileNotFoundException(file.getAbsolutePath() + " does not exist.");
-        }
-        return new Configurator(file.getAbsolutePath(), false);
+        return new Configurator(new FileSource(file));
     }
 
     /**
-     * Use Uri as the pdf source, for use with content provider
+     * Use URI as the pdf source, for use with content providers
      */
     public Configurator fromUri(Uri uri) {
-        return new Configurator(uri.toString(), false);
+        return new Configurator(new UriSource(uri));
+    }
+
+    /**
+     * Use bytearray as the pdf source, documents is not saved
+     * @param bytes
+     * @return
+     */
+    public Configurator fromBytes(byte[] bytes) {
+        return new Configurator(new ByteArraySource(bytes));
+    }
+
+    public Configurator fromStream(InputStream stream) {
+        return new Configurator(new InputStreamSource(stream));
+    }
+
+    /**
+     * Use custom source as pdf source
+     */
+    public Configurator fromSource(DocumentSource docSource) {
+        return new Configurator(docSource);
     }
 
     private enum State {DEFAULT, LOADED, SHOWN, ERROR}
 
     public class Configurator {
 
-        private final String path;
-
-        private final boolean isAsset;
+        private final DocumentSource documentSource;
 
         private int[] pageNumbers = null;
 
@@ -1176,9 +1182,8 @@ public class Configurator {
 
         private ScrollHandle scrollHandle = null;
 
-        private Configurator(String path, boolean isAsset) {
-            this.path = path;
-            this.isAsset = isAsset;
+        private Configurator(DocumentSource documentSource) {
+            this.documentSource = documentSource;
         }
 
         public Configurator pages(int... pageNumbers) {
@@ -1259,9 +1264,9 @@ public void load() {
             PDFView.this.setScrollHandle(scrollHandle);
             PDFView.this.dragPinchManager.setSwipeVertical(swipeVertical);
             if (pageNumbers != null) {
-                PDFView.this.load(path, isAsset, password, onLoadCompleteListener, onErrorListener, pageNumbers);
+                PDFView.this.load(documentSource, password, onLoadCompleteListener, onErrorListener, pageNumbers);
             } else {
-                PDFView.this.load(path, isAsset, password, onLoadCompleteListener, onErrorListener);
+                PDFView.this.load(documentSource, password, onLoadCompleteListener, onErrorListener);
             }
         }
     }

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

@@ -15,6 +15,7 @@
  */
 package com.github.barteksc.pdfviewer.exception;
 
+@Deprecated
 public class FileNotFoundException extends RuntimeException {
 
     public FileNotFoundException(String detailMessage) {

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2016 Bartosz Schiller.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.barteksc.pdfviewer.source;
+
+
+import android.content.Context;
+import android.os.ParcelFileDescriptor;
+
+import com.github.barteksc.pdfviewer.util.FileUtils;
+import com.shockwave.pdfium.PdfDocument;
+import com.shockwave.pdfium.PdfiumCore;
+
+import java.io.File;
+import java.io.IOException;
+
+public class AssetSource implements DocumentSource {
+
+    private final String assetName;
+
+    public AssetSource(String assetName) {
+        this.assetName = assetName;
+    }
+
+    @Override
+    public PdfDocument createDocument(Context context, PdfiumCore core, String password) throws IOException {
+        File f = FileUtils.fileFromAsset(context, assetName);
+        ParcelFileDescriptor pfd = ParcelFileDescriptor.open(f, ParcelFileDescriptor.MODE_READ_ONLY);
+        return core.newDocument(pfd, password);
+    }
+}

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 Bartosz Schiller.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.barteksc.pdfviewer.source;
+
+import android.content.Context;
+
+import com.shockwave.pdfium.PdfDocument;
+import com.shockwave.pdfium.PdfiumCore;
+
+import java.io.IOException;
+
+public class ByteArraySource implements DocumentSource {
+
+    private byte[] data;
+
+    public ByteArraySource(byte[] data) {
+        this.data = data;
+    }
+
+    @Override
+    public PdfDocument createDocument(Context context, PdfiumCore core, String password) throws IOException {
+        return core.newDocument(data, password);
+    }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2016 Bartosz Schiller.
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.github.barteksc.pdfviewer.source;
+
+import android.content.Context;
+
+import com.shockwave.pdfium.PdfDocument;
+import com.shockwave.pdfium.PdfiumCore;
+
+import java.io.IOException;
+
+public interface DocumentSource {
+    PdfDocument createDocument(Context context, PdfiumCore core, String password) throws IOException;
+}