Merge pull request #10031 from garymathews/TIMOB-25231

[TIMOB-25231] Android: List encrypted assets
tidev · May 16, 2018 · fbb7eae · fbb7eae
2 parents dc1e0c8 + 0fab7ef
commit fbb7eae
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 19 deletions.
diff --git a/android/runtime/common/src/java/org/appcelerator/kroll/util/KrollAssetHelper.java b/android/runtime/common/src/java/org/appcelerator/kroll/util/KrollAssetHelper.java
@@ -26,6 +26,7 @@ public class KrollAssetHelper
 
 	public interface AssetCrypt {
 		String readAsset(String path);
+		String[] getAssetPaths();
 	}
 
 	public static void setAssetCrypt(AssetCrypt assetCrypt)
@@ -77,6 +78,14 @@ public static String readAsset(String path)
 		return null;
 	}
 
+	public static String[] getEncryptedAssetPaths()
+	{
+		if (assetCrypt != null) {
+			return assetCrypt.getAssetPaths();
+		}
+		return null;
+	}
+
 	public static String readFile(String path)
 	{
 		try {

diff --git a/android/templates/build/AssetCryptImpl.java b/android/templates/build/AssetCryptImpl.java
@@ -48,6 +48,10 @@ public String readAsset(String path)
 		return new String(filterDataInRange(assetsBytes, range.offset, range.length));
 	}
 
+	public String[] getAssetPaths() {
+		return assets.keySet().toArray(new String[assets.size()]);
+	}
+
 	private static byte[] filterDataInRange(byte[] data, int offset, int length)
 	{
 		try {

diff --git a/android/titanium/src/java/org/appcelerator/titanium/io/TiResourceFile.java b/android/titanium/src/java/org/appcelerator/titanium/io/TiResourceFile.java
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import org.appcelerator.kroll.common.Log;
+import org.appcelerator.kroll.util.KrollAssetHelper;
 import org.appcelerator.titanium.TiApplication;
 import org.appcelerator.titanium.TiBlob;
 import org.appcelerator.titanium.TiC;
@@ -29,7 +30,7 @@ public class TiResourceFile extends TiBaseFile
 {
 	private static final String TAG = "TiResourceFile";
 
-	private final String path;
+	private String path;
 	private boolean statsFetched = false;
 	private boolean exists = false;
 
@@ -190,6 +191,9 @@ public long spaceAvailable()
 
 	public String toURL()
 	{
+		if (!path.isEmpty() && !path.endsWith("/") && isDirectory()) {
+			path += "/";
+		}
 		return TiC.URL_ANDROID_ASSET_RESOURCES + path;
 	}
 
@@ -222,17 +226,39 @@ public List<String> getDirectoryListing()
 	{
 		List<String> listing = new ArrayList<String>();
 		try {
-			String lpath = TiFileHelper2.joinSegments("Resources", path);
+			String lpath = TiFileHelper2.getResourcesPath(path);
 			if (lpath.endsWith("/")) {
 				lpath = lpath.substring(0, lpath.lastIndexOf("/"));
 			}
+
+			// list application assets
 			String[] names = TiApplication.getInstance().getAssets().list(lpath);
 			if (names != null) {
 				int len = names.length;
 				for (int i = 0; i < len; i++) {
 					listing.add(names[i]);
 				}
 			}
+
+			// list encrypted assets
+			String[] assets = KrollAssetHelper.getEncryptedAssetPaths();
+			if (assets != null) {
+				for (String asset : assets) {
+					if (asset.startsWith(path)) {
+						String relativePath = asset.substring(path.length());
+						int dirIndex = relativePath.lastIndexOf('/');
+						if (dirIndex != -1) {
+							String dir = relativePath.substring(0, dirIndex);
+							if (dir.length() > 0 && !listing.contains(dir)) {
+								listing.add(dir);
+							}
+						} else if (relativePath.length() > 0) {
+							listing.add(relativePath);
+						}
+					}
+				}
+			}
+
 		} catch (IOException e) {
 			Log.e(TAG, "Error while getting a directory listing: " + e.getMessage(), e);
 		}
@@ -246,33 +272,23 @@ public String toString()
 
 	private void fetchStats()
 	{
-		InputStream is = null;
-		try {
-			is = getInputStream();
+		if (KrollAssetHelper.assetExists(TiFileHelper2.getResourcesPath(path))) {
 			this.typeDir = false;
 			this.typeFile = true;
 			this.exists = true;
-		} catch (IOException e) {
-			this.typeFile = false; // definitely not a file
-			// getInputStream() will throw a FileNotFoundException if it is a
-			// directory. We check if there are directory listings. If there is,
-			// we can assume it is a directory and it exists.
+
+		} else {
+			this.typeFile = false;
+
 			if (!getDirectoryListing().isEmpty()) {
 				this.typeDir = true;
 				this.exists = true;
+
+				// does not exist; neither file or directory
 			} else {
-				// doesn't exist so neither file nor directory
 				this.typeDir = false;
 				this.exists = false;
 			}
-		} finally {
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					// Ignore
-				}
-			}
 		}
 		statsFetched = true;
 	}