Merge pull request #129 from virxkane/issue126

Issue126

Author: buggins

android/jni/cr3engine.cpp

@@ -857,6 +857,7 @@ static JNINativeMethod sDocViewMethods[] = {
   {"destroyInternal", "()V", (void*)Java_org_coolreader_crengine_DocView_destroyInternal},
   {"getPageImageInternal", "(Landroid/graphics/Bitmap;I)V", (void*)Java_org_coolreader_crengine_DocView_getPageImageInternal},
   {"loadDocumentInternal", "(Ljava/lang/String;)Z", (void*)Java_org_coolreader_crengine_DocView_loadDocumentInternal},
+  {"loadDocumentFromMemoryInternal", "([BLjava/lang/String;)Z", (void*)Java_org_coolreader_crengine_DocView_loadDocumentFromMemoryInternal},
   {"getSettingsInternal", "()Ljava/util/Properties;", (void*)Java_org_coolreader_crengine_DocView_getSettingsInternal},
   {"applySettingsInternal", "(Ljava/util/Properties;)Z", (void*)Java_org_coolreader_crengine_DocView_applySettingsInternal},
   {"setStylesheetInternal", "(Ljava/lang/String;)V", (void*)Java_org_coolreader_crengine_DocView_setStylesheetInternal},

android/jni/docview.cpp

@@ -891,6 +891,25 @@ bool DocViewNative::loadDocument( lString16 filename )
     return res;
 }
 
+bool DocViewNative::loadDocument( LVStreamRef stream, lString16 contentPath )
+{
+	CRLog::info("Loading document from memory stream, content path: %s", LCSTR(contentPath));
+	bool res = _docview->LoadDocument(stream, contentPath.c_str(), false);
+	if (res)
+		CRLog::info("Document %s is loaded successfully", LCSTR(contentPath));
+	else {
+		CRLog::info("Document %s not is loaded due to error", LCSTR(contentPath));
+		if (_docview->getDocument() == NULL) {
+			// _docview->LoadDocument() can return false with _docview->m_doc == NULL when:
+			// 1. I/O error - failed to open file
+			// 2. open archive without supported files
+			CRLog::error("Document is NULL, inserting stub.");
+			_docview->createDefaultDocument(lString16::empty_str, Utf8ToUnicode("Error while opening file!"));
+		}
+	}
+	return res;
+}
+
 bool DocViewNative::openRecentBook()
 {
 	CRLog::debug("DocViewNative::openRecentBook()");
@@ -1331,6 +1350,27 @@ JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_loadDocumentInte
     return res ? JNI_TRUE : JNI_FALSE;
 }
 
+/*
+ * Class:     org_coolreader_crengine_DocView
+ * Method:    loadDocumentFromMemoryInternal
+ * Signature: ([BLjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_coolreader_crengine_DocView_loadDocumentFromMemoryInternal
+		(JNIEnv * _env, jobject _this, jbyteArray buf, jstring contentPath)
+{
+	CRJNIEnv env(_env);
+	DocViewNative * p = getNative(_env, _this);
+	if (!p) {
+		CRLog::error("Cannot get native view");
+		return JNI_FALSE;
+	}
+	DocViewCallback callback( _env, p->_docview, _this );
+	LVStreamRef stream = env.jbyteArrayToStream(buf);
+	lString16 contentPath16 = env.fromJavaString(contentPath);
+	bool res = p->loadDocument(stream, contentPath16);
+	return res ? JNI_TRUE : JNI_FALSE;
+}
+
 /*
  * Class:     org_coolreader_crengine_DocView
  * Method:    getSettings

android/jni/docview.h

@@ -30,6 +30,7 @@ class DocViewNative {
 	bool saveHistory( lString16 filename );
 	void createDefaultDocument( lString16 title, lString16 message );
 	bool loadDocument( lString16 filename );
+	bool loadDocument( LVStreamRef stream, lString16 contentPath );
 	int doCommand( int cmd, int param );
     bool findText( lString16 pattern, int origin, bool reverse, bool caseInsensitive );
     void clearSelection();

android/jni/org_coolreader_crengine_DocView.h

@@ -1,6 +1,9 @@
 // Main Class
 package org.coolreader;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Date;
@@ -43,6 +46,7 @@
 
 import android.Manifest;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -275,16 +279,6 @@ public void setFullscreen(boolean fullscreen) {
 			mReaderFrame.updateFullscreen(fullscreen);
 	}
 
-	private String extractFileName(Uri uri) {
-		if (uri != null) {
-			if (uri.equals(Uri.parse("file:///")))
-				return null;
-			else
-				return uri.getPath();
-		}
-		return null;
-	}
-
 	@Override
 	protected void onNewIntent(Intent intent) {
 		log.i("onNewIntent : " + intent);
@@ -300,63 +294,19 @@ private boolean processIntent(Intent intent) {
 		if (intent == null)
 			return false;
 		String fileToOpen = null;
-		String scheme = null;
-		String host = null;
+		Uri uri = null;
 		if (Intent.ACTION_VIEW.equals(intent.getAction())) {
-			Uri uri = intent.getData();
+			uri = intent.getData();
 			intent.setData(null);
 			if (uri != null) {
-				scheme = uri.getScheme();
-				host = uri.getHost();
-				if (uri.getEncodedPath().contains("%00"))
-					fileToOpen = uri.getEncodedPath();
-				else
-					fileToOpen = uri.getPath();
-//				if (fileToOpen.startsWith("file://"))
-//					fileToOpen = fileToOpen.substring("file://".length());
+				fileToOpen = filePathFromUri(uri);
 			}
 		}
 		if (fileToOpen == null && intent.getExtras() != null) {
 			log.d("extras=" + intent.getExtras());
 			fileToOpen = intent.getExtras().getString(OPEN_FILE_PARAM);
 		}
 		if (fileToOpen != null) {
-			// parse uri from system filemanager
-			if (fileToOpen.contains("%00")) {
-				// splitter between archive file name and inner file.
-				fileToOpen = fileToOpen.replace("%00", "@/");
-				fileToOpen = Uri.decode(fileToOpen);
-			}
-			if ("content".equals(scheme)) {
-				if ("com.android.externalstorage.documents".equals(host)) {
-					// application "Files" by Google, package="com.android.externalstorage.documents"
-					if (fileToOpen.matches("^/document/.*:.*$")) {
-						// decode special uri form: /document/primary:<somebody>
-						//                          /document/XXXX-XXXX:<somebody>
-						String shortcut = fileToOpen.replaceFirst("^/document/(.*):.*$", "$1");
-						String mountRoot = Engine.getMountRootByShortcut(shortcut);
-						if (mountRoot != null)
-							fileToOpen = fileToOpen.replaceFirst("^/document/.*:(.*)$", mountRoot + "/$1");
-					}
-				} else if ("com.google.android.apps.nbu.files.provider".equals(host)) {
-					// application "Files" by Google, package="com.google.android.apps.nbu.files"
-					if (fileToOpen.startsWith("/1////")) {
-						// skip "/1///"
-						fileToOpen = fileToOpen.substring(5);
-						fileToOpen = Uri.decode(fileToOpen);
-					} else if (fileToOpen.startsWith("/1/file:///")) {
-						// skip "/1/file://"
-						fileToOpen = fileToOpen.substring(10);
-						fileToOpen = Uri.decode(fileToOpen);
-					}
-				}
-			}
-		}
-		if (fileToOpen != null) {
-			// patch for opening of books from ReLaunch (under Nook Simple Touch) 
-			while (fileToOpen.indexOf("%2F") >= 0) {
-				fileToOpen = fileToOpen.replace("%2F", "/");
-			}
 			log.d("FILE_TO_OPEN = " + fileToOpen);
 			final String finalFileToOpen = fileToOpen;
 			loadDocument(fileToOpen, new Runnable() {
@@ -379,12 +329,105 @@ public void onDismiss(DialogInterface dialog) {
 				}
 			});
 			return true;
+		} else if (null != uri) {
+			log.d("URI_TO_OPEN = " + uri);
+			final String uriString = uri.toString();
+			loadDocumentFromUri(uri, new Runnable() {
+				@Override
+				public void run() {
+					BackgroundThread.instance().postGUI(new Runnable() {
+						@Override
+						public void run() {
+							// if document not loaded show error & then root window
+							ErrorDialog errDialog = new ErrorDialog(CoolReader.this, CoolReader.this.getString(R.string.error), CoolReader.this.getString(R.string.cant_open_file, uriString));
+							errDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+								@Override
+								public void onDismiss(DialogInterface dialog) {
+									showRootWindow();
+								}
+							});
+							errDialog.show();
+						}
+					}, 500);
+				}
+			});
+			return true;
 		} else {
 			log.d("No file to open");
 			return false;
 		}
 	}
 
+	private String filePathFromUri(Uri uri) {
+		if (null == uri)
+			return null;
+		String filePath = null;
+		String scheme = uri.getScheme();
+		String host = uri.getHost();
+		if ("file".equals(scheme)) {
+			filePath = uri.getPath();
+			// patch for opening of books from ReLaunch (under Nook Simple Touch)
+			if (null != filePath) {
+				if (filePath.contains("%2F"))
+					filePath = filePath.replace("%2F", "/");
+			}
+		} else if ("content".equals(scheme)) {
+			if (uri.getEncodedPath().contains("%00"))
+				filePath = uri.getEncodedPath();
+			else
+				filePath = uri.getPath();
+			if (null != filePath) {
+				// parse uri from system filemanager
+				if (filePath.contains("%00")) {
+					// splitter between archive file name and inner file.
+					filePath = filePath.replace("%00", "@/");
+					filePath = Uri.decode(filePath);
+				}
+				if ("com.android.externalstorage.documents".equals(host)) {
+					// application "Files" by Google, package="com.android.externalstorage.documents"
+					if (filePath.matches("^/document/.*:.*$")) {
+						// decode special uri form: /document/primary:<somebody>
+						//                          /document/XXXX-XXXX:<somebody>
+						String shortcut = filePath.replaceFirst("^/document/(.*):.*$", "$1");
+						String mountRoot = Engine.getMountRootByShortcut(shortcut);
+						if (mountRoot != null) {
+							filePath = filePath.replaceFirst("^/document/.*:(.*)$", mountRoot + "/$1");
+						}
+					}
+				} else if ("com.google.android.apps.nbu.files.provider".equals(host)) {
+					// application "Files" by Google, package="com.google.android.apps.nbu.files"
+					if (filePath.startsWith("/1////")) {
+						// skip "/1///"
+						filePath = filePath.substring(5);
+						filePath = Uri.decode(filePath);
+					} else if (filePath.startsWith("/1/file:///")) {
+						// skip "/1/file://"
+						filePath = filePath.substring(10);
+						filePath = Uri.decode(filePath);
+					}
+				} else {
+					// Try some common conversions...
+					if (filePath.startsWith("/file%3A%2F%2F")) {
+						filePath = filePath.substring(14);
+						filePath = Uri.decode(filePath);
+						if (filePath.contains("%20")) {
+							filePath = filePath.replace("%20", " ");
+						}
+					}
+				}
+			}
+		}
+		File file;
+		int pos = filePath.indexOf("@/");
+		if (pos > 0)
+			file = new File(filePath.substring(0, pos));
+		else
+			file = new File(filePath);
+		if (!file.exists())
+			filePath = null;
+		return filePath;
+	}
+
 	@Override
 	protected void onPause() {
 		super.onPause();
@@ -915,6 +958,22 @@ public void run() {
 		});
 	}
 
+	public void loadDocumentFromUri(final Uri uri, final Runnable callback) {
+		runInReader(new Runnable() {
+			@Override
+			public void run() {
+				ContentResolver contentResolver = getContentResolver();
+				InputStream inputStream = null;
+				try {
+					inputStream = contentResolver.openInputStream(uri);
+					mReaderView.loadDocumentFromStream(inputStream, uri.getPath(), callback);
+				} catch (FileNotFoundException e) {
+					callback.run();
+				}
+			}
+		});
+	}
+
 	public void loadDocument(FileInfo item) {
 		loadDocument(item, null);
 	}

android/src/org/coolreader/CoolReader.java

@@ -3,6 +3,10 @@
 
 import android.graphics.Bitmap;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
 public class DocView {
 
 	public static final Logger log = L.create("dv");
@@ -159,6 +163,32 @@ public boolean loadDocument(String fileName) {
 		}
 	}
 
+	/**
+	 * Load document from input stream.
+	 * @param inputStream
+	 * @param contentPath
+	 * @return
+	 */
+	public boolean loadDocumentFromStream(InputStream inputStream, String contentPath) {
+		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+		byte [] buf = new byte [1024];
+		int readBytes;
+		while (true) {
+			try {
+				readBytes = inputStream.read(buf);
+				if (readBytes > 0)
+					outputStream.write(buf, 0, readBytes);
+				else
+					break;
+			} catch (IOException e) {
+				break;
+			}
+		}
+		synchronized(mutex) {
+			return loadDocumentFromMemoryInternal(outputStream.toByteArray(), contentPath);
+		}
+	}
+
 	/**
 	 * Get settings from native object.
 	 * @return
@@ -411,6 +441,8 @@ public void hilightBookmarks(Bookmark[] bookmarks) {
 
 	private native boolean loadDocumentInternal(String fileName);
 
+	private native boolean loadDocumentFromMemoryInternal(byte [] buf, String contentPath);
+
 	private native java.util.Properties getSettingsInternal();
 
 	private native boolean applySettingsInternal(