fix(android): add extension to encrypted assets (#11351)

* fix(android): add extension to encrypted assets * fix(android): update template to include extension
tidev · Nov 19, 2019 · bf8a6bf · bf8a6bf
1 parent 8ac7eec
commit bf8a6bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/android/cli/commands/_build.js b/android/cli/commands/_build.js
@@ -2832,7 +2832,7 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
 				await Promise.all(
 					jsFilesToEncrypt.map(async file => {
 						const from = path.join(this.buildAssetsDir, file);
-						const to = path.join(this.buildBinAssetsResourcesDir, file);
+						const to = path.join(this.buildBinAssetsResourcesDir, file + '.bin');
 
 						this.logger.debug(__('Encrypting: %s', from.cyan));
 						await fs.ensureDir(path.dirname(to));

diff --git a/android/templates/build/AssetCryptImpl.java b/android/templates/build/AssetCryptImpl.java
@@ -22,6 +22,8 @@ public class AssetCryptImpl implements KrollAssetHelper.AssetCrypt
 {
 	private static final String TAG = "AssetCryptImpl";
 
+	private static final String BIN_EXT = ".bin";
+
 	private static byte[] salt = {
 		<% for (let i = 0; i < salt.length - 1; i++){ -%>
 <%- '(byte)' + salt.readUInt8(i) + ', ' -%>
@@ -73,6 +75,9 @@ private static InputStream getAssetStream(String path)
 		if (!assets.contains(path)) {
 			return null;
 		}
+		if (!path.endsWith(BIN_EXT)) {
+			path = path + BIN_EXT;
+		}
 		try {
 			Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
 			cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(ti.cloak.Binding.getKey(salt), "AES"), new IvParameterSpec(salt));