use the connonnical path to the root RootPackageDir and ApplicationFilesPath. (fixes bug where the canonical path is different than the device path due to sym links)

Author: blagoev

src/src/com/tns/FileSystem.java

@@ -14,6 +14,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.util.Log;
+
 public class FileSystem
 {
 	public static String readAll(InputStream inputStream) throws IOException
@@ -94,15 +96,17 @@ public static JSONObject readJSONFile(File file) throws IOException, JSONExcepti
 		return new JSONObject(content);
 	}
 
-	public static String resolveRelativePath(String path, String currentDirectory){
+	public static String resolveRelativePath(String path, String currentDirectory)
+	{
 		File temp = new File(currentDirectory, path);
 		try
 		{
 			return temp.getCanonicalPath();
 		}
 		catch (IOException e)
 		{
-			try{
+			try
+			{
 				URI uri = new URI(currentDirectory);
 				return uri.resolve(path).getPath();
 			}

src/src/com/tns/Require.java

@@ -2,6 +2,8 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 
 import org.json.JSONException;
@@ -28,10 +30,17 @@ public static void init(Context context)
 		{
 			return;
 		}
-
-		RootPackageDir = context.getApplicationInfo().dataDir;
-
-		ApplicationFilesPath = context.getApplicationContext().getFilesDir().getPath();
+		
+		try
+		{
+			RootPackageDir = new File(context.getApplicationInfo().dataDir).getCanonicalPath();
+			ApplicationFilesPath = context.getApplicationContext().getFilesDir().getCanonicalPath();
+		}
+		catch (IOException e)
+		{
+			e.printStackTrace();
+		}
+		
 		ModulesFilesPath = "/app/";
 
 		NativeScriptModulesFilesPath = "/app/tns_modules/";
@@ -80,43 +89,43 @@ public static String getModulePath(String moduleName, String callingDirName)
 	{
 		// This method is called my the NativeScriptRuntime.cpp RequireCallback method.
 		// The currentModuleDir is the directory path of the calling module.
-//		checkForExternalPath = true;
+		checkForExternalPath = true;
 		File file = findModuleFile(moduleName, callingDirName);
 
 		if (file != null && file.exists())
 		{
 			File projectRootDir = new File(RootPackageDir);
-//			if (checkForExternalPath && isFileExternal(file, projectRootDir))
-//			{
-//				return "EXTERNAL_FILE_ERROR";
-//			}
-//			else
-//			{
+			if (checkForExternalPath && isFileExternal(file, projectRootDir))
+			{
+				return "EXTERNAL_FILE_ERROR";
+			}
+			else
+			{
 				return file.getAbsolutePath();
-//			}
+			}
 		}
 
 		// empty path will be handled by the NativeScriptRuntime.cpp and a JS error will be thrown
 		return "";
 	}
 
-//	private static boolean isFileExternal(File source, File target)
-//	{
-//		File currentParentDir = source.getParentFile();
-//
-//		while (currentParentDir != null)
-//		{
-//			if (currentParentDir.equals(target))
-//			{
-//				return false;
-//			}
-//
-//			currentParentDir = currentParentDir.getParentFile();
-//		}
-//
-//		return true;
-//	}
+	private static boolean isFileExternal(File source, File target)
+	{
+		File currentParentDir = source.getParentFile();
+
+		while (currentParentDir != null)
+		{
+			if (currentParentDir.equals(target))
+			{
+				return false;
+			}
 
+			currentParentDir = currentParentDir.getParentFile();
+		}
+
+		return true;
+	}
+	
 	private static File findModuleFile(String moduleName, String currentDirectory)
 	{
 		File directory = null;