summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorRobin Watts <robin.watts@artifex.com>2013-08-14 11:05:04 +0100
committerTor Andersson <tor.andersson@artifex.com>2013-08-14 14:41:20 +0200
commit8530783a10e467947f8698cf44d38313b5454cb2 (patch)
tree821b472eea9754406e8baff3fd1de401ca6a745b /platform/android
parent358898aefabc7ac13e26619911c90709dc1eaef7 (diff)
downloadmupdf-8530783a10e467947f8698cf44d38313b5454cb2.tar.xz
Bug 694516: Fix Android operation with passworded files.
Don't countPages until after we have a password.
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java b/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
index ff38b22a..5590d1a1 100644
--- a/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
+++ b/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
@@ -306,13 +306,15 @@ public class MuPDFActivity extends Activity
core = openFile(Uri.decode(uri.getEncodedPath()));
}
SearchTaskResult.set(null);
- if (core.countPages() == 0)
- core = null;
}
if (core != null && core.needsPassword()) {
requestPassword(savedInstanceState);
return;
}
+ if (core != null && core.countPages() == 0)
+ {
+ core = null;
+ }
}
if (core == null)
{