1. Correct HTTPRequest encoding

zhourenjian · zhourenjian · commit c405f6db7800 · 2016-03-21T22:39:34.000+08:00
2. Make SimpleStore robust on private browsing
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java
@@ -221,7 +221,14 @@ public String getResponseText() {
 						if (matcher.find()) {
 							charset = matcher.group(1);
 						} else {
-							responseText = tmp;
+							matcher = Pattern.compile(
+									"<meta.*\\s+charset\\s*=\\s*[\'\"]([^'\"]*)\\s*[\'\"].*>", 
+									Pattern.MULTILINE | Pattern.CASE_INSENSITIVE).matcher(tmp);
+							if (matcher.find()) {
+								charset = matcher.group(1);
+							} else {
+								responseText = tmp;
+							}
 						}
 					}
 				}
@@ -552,9 +559,11 @@ private void request() {
 				if (checkAbort()) return; // exception caused by abort action
 				//e.printStackTrace();
 				status = connection.getResponseCode();
-				readyState = 4;
-				if (onreadystatechange != null) {
-					onreadystatechange.onLoaded();
+				if (readyState != 4) {
+					readyState = 4;
+					if (onreadystatechange != null) {
+						onreadystatechange.onLoaded();
+					}
 				}
 				connection = null;
 				readyState = 0;
diff --git a/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/SimpleStore.java b/sources/net.sf.j2s.ajax/store/net/sf/j2s/store/SimpleStore.java
@@ -22,8 +22,13 @@ private SimpleStore() {
 	isLocalFile = true;
 }
 if (window["j2s.html5.store"] && window["localStorage"] != null && (ua.indexOf ("gecko/") == -1 || !isLocalFile)) {
-	this.store = new net.sf.j2s.store.HTML5LocalStorage ();
-	return;
+	try {
+		localStorage.setItem('net.sf.j2s.test', '1');
+		localStorage.removeItem('net.sf.j2s.test');
+		this.store = new net.sf.j2s.store.HTML5LocalStorage ();
+		return;
+	} catch (error) {
+	}
 }
 var isLocal = false;
 try {
@@ -41,10 +46,10 @@ private SimpleStore() {
 }
 		 */ {
 			File storeFile = new File(System.getProperty("user.home"), ".java2script.store");
-			this.store = new INIFileStore(storeFile.getAbsolutePath()); 
+			this.store = new INIFileStore(storeFile.getAbsolutePath());
 		}
 	}
-	
+
 	public static SimpleStore getDefault() {
 		if (singleton == null) {
 			singleton = new SimpleStore();

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,13 @@ private SimpleStore() {`
`22`	`22`	`isLocalFile = true;`
`23`	`23`	`}`
`24`	`24`	`if (window["j2s.html5.store"] && window["localStorage"] != null && (ua.indexOf ("gecko/") == -1 \|\| !isLocalFile)) {`
`25`		`- this.store = new net.sf.j2s.store.HTML5LocalStorage ();`
`26`		`- return;`
	`25`	`+ try {`
	`26`	`+ localStorage.setItem('net.sf.j2s.test', '1');`
	`27`	`+ localStorage.removeItem('net.sf.j2s.test');`
	`28`	`+ this.store = new net.sf.j2s.store.HTML5LocalStorage ();`
	`29`	`+ return;`
	`30`	`+ } catch (error) {`
	`31`	`+ }`
`27`	`32`	`}`
`28`	`33`	`var isLocal = false;`
`29`	`34`	`try {`
`@@ -41,10 +46,10 @@ private SimpleStore() {`
`41`	`46`	`}`
`42`	`47`	`*/ {`
`43`	`48`	`File storeFile = new File(System.getProperty("user.home"), ".java2script.store");`
`44`		`- this.store = new INIFileStore(storeFile.getAbsolutePath());`
	`49`	`+ this.store = new INIFileStore(storeFile.getAbsolutePath());`
`45`	`50`	`}`
`46`	`51`	`}`
`47`		`-`
	`52`	`+`
`48`	`53`	`public static SimpleStore getDefault() {`
`49`	`54`	`if (singleton == null) {`
`50`	`55`	`singleton = new SimpleStore();`