phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'development'

Browse Source 
Conflicts:
	mobile/res/xml/preferences.xml
	mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
This commit is contained in:
Philipp Schaefer
2013-10-22 20:45:06 +02:00
parent 22ba06512e 3d7192ecd6
commit 796f693370
20 changed files with 366 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/src/com/cradle/iitc_mobile/IITC_WebViewClient.java
View File

@ -49,9 +49,10 @@ public class IITC_WebViewClient extends WebViewClient {
public String getIITCVersion() {
String header = "";
if (mIitcScript != null)
if (mIitcScript != null) {
header = mIitcScript.substring(mIitcScript.indexOf("==UserScript=="),
mIitcScript.indexOf("==/UserScript=="));
}
// remove new line comments
header = header.replace("\n//", "");
// get a list of key-value
@ -59,8 +60,9 @@ public class IITC_WebViewClient extends WebViewClient {
String iitc_version = "not found";
for (int i = 0; i < attributes.length; i++) {
// search for version and use the value
if (attributes[i].equals("@version"))
if (attributes[i].equals("@version")) {
iitc_version = attributes[i + 1];
}
}
return iitc_version;
}
@ -200,10 +202,11 @@ public class IITC_WebViewClient extends WebViewClient {
// load it as javascript
public boolean loadJS(String file, boolean asset, WebView view) {
String js = fileToString(file, asset);
if (js.equals("false"))
if (js.equals("false")) {
return false;
else
} else {
view.loadUrl("javascript:" + js);
}
return true;
}
@ -234,8 +237,9 @@ public class IITC_WebViewClient extends WebViewClient {
}
}
if (s != null)
if (s != null) {
src = s.hasNext() ? s.next() : "";
}
return src;
}