Merge pull request #9711 from garymathews/TIMOB-25081_63X

[6_3_X][TIMOB-25081] Backport critical crash fixes
tidev · Jan 10, 2018 · 6b311b9 · 6b311b9
2 parents 83c3ad4 + ed4208f
commit 6b311b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 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
@@ -20,7 +20,7 @@
 public class KrollAssetHelper
 {
 	private static final String TAG = "TiAssetHelper";
-	private static WeakReference<AssetManager> manager;
+	private static AssetManager assetManager;
 	private static String packageName, cacheDir;
 	private static AssetCrypt assetCrypt;
 
@@ -36,7 +36,7 @@ public static void setAssetCrypt(AssetCrypt assetCrypt)
 
 	public static void init(Context context)
 	{
-		KrollAssetHelper.manager = new WeakReference<AssetManager>(context.getAssets());
+		KrollAssetHelper.assetManager = context.getAssets();
 		KrollAssetHelper.packageName = context.getPackageName();
 		KrollAssetHelper.cacheDir = context.getCacheDir().getAbsolutePath();
 	}
@@ -53,7 +53,6 @@ public static String readAsset(String path)
 		}
 
 		try {
-			AssetManager assetManager = manager.get();
 			if (assetManager == null) {
 				Log.e(TAG, "AssetManager is null, can't read asset: " + path);
 				return null;
@@ -112,8 +111,7 @@ public static boolean assetExists(String path) {
 				return true;
 			}
 		}
-		if (manager != null) {
-			AssetManager assetManager = manager.get();
+		if (assetManager != null) {
 			try {
 				return assetManager != null && assetManager.open(path) != null;
 			} catch (IOException e) {}

diff --git a/android/runtime/common/src/js/module.js b/android/runtime/common/src/js/module.js
@@ -619,5 +619,5 @@ Module.prototype.filenameExists = function (filename) {
 		fileIndex = JSON.parse(json);
 	}
 
-	return filename in fileIndex;
+	return fileIndex && filename in fileIndex;
 }