summaryrefslogtreecommitdiff
path: root/platform/android/src/com
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2015-04-14 16:08:28 +0200
committerRobin Watts <robin.watts@artifex.com>2015-04-14 16:14:01 +0100
commit3fdc712c45c2f91d04e44295cc7586434e23ffe7 (patch)
tree9b9cc1f9596d8ab4a955eea1359b8483be1d8ec3 /platform/android/src/com
parent8ee81ce0d031c3f00761c4b356cd227f31157a59 (diff)
downloadmupdf-3fdc712c45c2f91d04e44295cc7586434e23ffe7.tar.xz
android: Add EPUB support to file chooser. Fix crash on non-pdf documents.
Diffstat (limited to 'platform/android/src/com')
-rw-r--r--platform/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java2
-rw-r--r--platform/android/src/com/artifex/mupdfdemo/MuPDFCore.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/platform/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java b/platform/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
index f74ccf4f..da7eafb8 100644
--- a/platform/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
+++ b/platform/android/src/com/artifex/mupdfdemo/ChoosePDFActivity.java
@@ -106,6 +106,8 @@ public class ChoosePDFActivity extends ListActivity {
return true;
if (fname.endsWith(".cbz"))
return true;
+ if (fname.endsWith(".epub"))
+ return true;
if (fname.endsWith(".png"))
return true;
if (fname.endsWith(".jpe"))
diff --git a/platform/android/src/com/artifex/mupdfdemo/MuPDFCore.java b/platform/android/src/com/artifex/mupdfdemo/MuPDFCore.java
index 750540b7..be6f6fbf 100644
--- a/platform/android/src/com/artifex/mupdfdemo/MuPDFCore.java
+++ b/platform/android/src/com/artifex/mupdfdemo/MuPDFCore.java
@@ -128,11 +128,10 @@ public class MuPDFCore
wasOpenedFromBuffer = true;
}
- public int countPages()
+ public int countPages()
{
if (numPages < 0)
numPages = countPagesSynchronized();
-
return numPages;
}