Bug 695811: Adopt Freds patch for Android crashes with strange filenames.

I can't claim to entirely understand why one formulation works and
the other doesn't, but it seems a harmless enough fix that apparently
works.

1 files changed, 5 insertions, 1 deletions

diff --git a/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java b/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
index 681ea317..58ea1aa3 100644
--- a/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
+++ b/platform/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
@@ -317,7 +317,11 @@ public class MuPDFActivity extends Activity implements FilePicker.FilePickerSupp
 				if (buffer != null) {
 					core = openBuffer(buffer, intent.getType());
 				} else {
-					core = openFile(Uri.decode(uri.getEncodedPath()));
+					String path = Uri.decode(uri.getEncodedPath());
+					if (path == null) {
+						path = uri.toString();
+					}
+					core = openFile(path);
 				}
 				SearchTaskResult.set(null);
 			}