Improved compatibility with file managers "Files" (com.android.externalstorage.documents)

and "Files" (com.google.android.apps.nbu.files).

Author: virxkane

android/src/org/coolreader/CoolReader.java

@@ -1,7 +1,6 @@
 // Main Class
 package org.coolreader;
 
-import java.io.File;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Date;
@@ -44,6 +43,7 @@
 
 import android.Manifest;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -301,10 +301,14 @@ private boolean processIntent(Intent intent) {
 		if (intent == null)
 			return false;
 		String fileToOpen = null;
+		String scheme = null;
+		String host = null;
 		if (Intent.ACTION_VIEW.equals(intent.getAction())) {
 			Uri uri = intent.getData();
 			intent.setData(null);
 			if (uri != null) {
+				scheme = uri.getScheme();
+				host = uri.getHost();
 				if (uri.getEncodedPath().contains("%00"))
 					fileToOpen = uri.getEncodedPath();
 				else
@@ -324,18 +328,29 @@ private boolean processIntent(Intent intent) {
 				fileToOpen = fileToOpen.replace("%00", "@/");
 				fileToOpen = Uri.decode(fileToOpen);
 			}
-			if (fileToOpen.startsWith("/document/primary:")) {
-				// scheme="content", host="com.android.externalstorage.documents"
-				// decode special uri form: /document/primary:<somebody>
-				File[] dataDirs = Engine.getStorageDirectories(false);
-				if (dataDirs != null && dataDirs.length > 0) {
-					fileToOpen = fileToOpen.replace("/document/primary:", dataDirs[0].getAbsolutePath() + "/");
+			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);
+					}
 				}
-			} else if (fileToOpen.startsWith("/1////")) {
-				// scheme="content", host="com.google.android.apps.nbu.files.provider"
-				// caused by "Google Files", package="com.google.android.apps.nbu.files"
-				// skip "/1///"
-				fileToOpen = fileToOpen.substring(5);
 			}
 		}
 		if (fileToOpen != null) {

android/src/org/coolreader/crengine/Engine.java

@@ -68,6 +68,36 @@ public static Map<String, String> getMountedRootsMap() {
 		return mountedRootsMap;
 	}
 
+	/**
+	 * @param shortcut File system shortcut that return application "Files" by Google (package="com.android.externalstorage.documents")
+	 *                 "primary" for internal storage,
+	 *                 "XXXX-XXXX" (file system serial number) for any external storage like sdcard, usb disk, etc.
+	 * @return path to mount root for given file system.
+	 */
+	public static String getMountRootByShortcut(String shortcut) {
+		String mountRoot = null;
+		if ("primary".equals(shortcut)) {
+			// "/document/primary:/.*"
+			for (Map.Entry<String, String> entry : mountedRootsMap.entrySet()) {
+				if ("SD".equals(entry.getValue())) {
+					mountRoot = entry.getKey();
+					break;
+				}
+			}
+		} else {
+			// "/document/XXXX-XXXX/.*"
+			String pattern = "/storage/" + shortcut;
+			for (Map.Entry<String, String> entry : mountedRootsMap.entrySet()) {
+				// Android 6 ext storage, @see addMountRoot()
+				if ("EXT SD".equals(entry.getValue()) && entry.getKey().startsWith(pattern)) {
+					mountRoot = entry.getKey();
+					break;
+				}
+			}
+		}
+		return mountRoot;
+	}
+
 	public boolean isRootsMountPoint(String path) {
 		if (mountedRootsMap == null)
 			return false;