You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2013/03/14 00:46:42 UTC
[1/2] webworks commit: [CB-2649] fix,
removes app temp directory name generation based on the
CordovaExtension getAppID method,
and replaces it with random generation. Also catches offending exception with
appropriate error message logging
[CB-2649] fix, removes app temp directory name generation based on the CordovaExtension getAppID method, and replaces it with random generation. Also catches offending exception with appropriate error message logging
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/703b93b8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/703b93b8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/703b93b8
Branch: refs/heads/master
Commit: 703b93b823d677b7a592856ffaa2e417f9cc1b58
Parents: 780161d
Author: doggerelverse <lo...@adobe.com>
Authored: Wed Mar 13 14:31:32 2013 -0700
Committer: doggerelverse <lo...@adobe.com>
Committed: Wed Mar 13 14:31:32 2013 -0700
----------------------------------------------------------------------
.../ext/src/org/apache/cordova/util/FileUtils.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/703b93b8/framework/ext/src/org/apache/cordova/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/org/apache/cordova/util/FileUtils.java b/framework/ext/src/org/apache/cordova/util/FileUtils.java
index 2655ef6..6f2f1e7 100644
--- a/framework/ext/src/org/apache/cordova/util/FileUtils.java
+++ b/framework/ext/src/org/apache/cordova/util/FileUtils.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Enumeration;
+import java.util.Random;
import javax.microedition.io.Connector;
import javax.microedition.io.file.FileConnection;
@@ -35,6 +36,7 @@ import net.rim.device.api.io.FileNotFoundException;
import net.rim.device.api.io.IOUtilities;
import net.rim.device.api.io.MIMETypeAssociations;
import net.rim.device.api.system.Application;
+import net.rim.device.api.system.ControlledAccessException;
/**
* Contains file utility methods.
@@ -45,7 +47,15 @@ public class FileUtils {
public static final String LOCAL_PROTOCOL = "local://";
public static final String FILE_PROTOCOL = "file://";
- private static final String APP_TMP_DIR = "tmp" + CordovaExtension.getAppID();
+ private static final String APP_TMP_DIR;
+
+ // init APP_TMP_DIR with a random value
+ static {
+ Random gen = new Random();
+ APP_TMP_DIR = "tmp" + gen.nextInt();
+ }
+
+ // private static long APP_TMP_DIR =
/**
* Reads file as byte array.
@@ -226,6 +236,9 @@ public class FileUtils {
return;
}
fconn.mkdir();
+ } catch (ControlledAccessException e) {
+ Logger.log("ControlledAccessException on dir " + dirPath + ", likely cause is directory intersection after reinstall of app, see Cordova Docs File Quirks");
+ Logger.log(e.getMessage());
}
finally {
try {