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

added new developer options (fix for 219)

Browse Source
This commit is contained in:
Philipp Schaefer 2013-05-03 01:02:08 +02:00
parent 039167051e
commit 430824825f
7 changed files with 71 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.py
View File

@ -220,7 +220,7 @@ if buildMobile:
os.makedirs("mobile/assets")
except:
pass
shutil.copy(os.path.join(outDir,"total-conversion-build.user.js"), "mobile/assets/iitc.js")
shutil.copy(os.path.join(outDir,"total-conversion-build.user.js"), "mobile/assets/total-conversion-build.user.js")
# copy the user location script into the mobile folder.
shutil.copy(os.path.join(outDir,"user-location.user.js"), "mobile/assets/user-location.user.js")

4
mobile/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cradle.iitc_mobile"
android:versionCode="13"
android:versionName="0.3.2" >
android:versionCode="14"
android:versionName="0.3.3" >
<uses-sdk
android:minSdkVersion="14"

3
mobile/res/values/strings.xml
View File

@ -39,6 +39,9 @@
<string name="pref_user_loc">Display user location</string>
<string name="pref_user_loc_sum">Show users position on map</string>
<string name="pref_developer_options">Developer options</string>
<string name="pref_enable_dev_options">Enable developer options</string>
<string name="pref_enable_dev_options_sum">If enabled, all IITC sources will be loaded from external storage of the Android device.
Please copy all sources from $IITC_folder/build/mobile/ to /sdcard/IITC_Mobile/dev/.</string>
<string name="pref_select_iitc">IITC source</string>
</resources>

6
mobile/res/xml/preferences.xml
View File

@ -38,6 +38,12 @@
android:summary=""
android:defaultValue="local"/>
<CheckBoxPreference
android:key="pref_dev_checkbox"
android:title="@string/pref_enable_dev_options"
android:summary="@string/pref_enable_dev_options_sum"
android:defaultValue="false" />
<ListPreference
android:key="pref_build_version"
android:title="@string/build_version"

3
mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
View File

@ -53,9 +53,8 @@ public class IITC_Mobile extends Activity {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (key.equals("pref_force_desktop"))
desktop = sharedPreferences.getBoolean("pref_force_desktop", false);
if (key.equals("pref_user_loc")) {
if (key.equals("pref_user_loc"))
user_loc = sharedPreferences.getBoolean("pref_user_loc", false);
}
IITC_Mobile.this.loadUrl(intel_url);
}
};

2
mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
View File

@ -23,6 +23,8 @@ public class IITC_WebView extends WebView {
settings.setAllowFileAccess(true);
settings.setGeolocationEnabled(true);
settings.setDatabasePath(this.getContext().getApplicationInfo().dataDir + "/databases/");
settings.setAppCachePath(this.getContext().getApplicationInfo().dataDir + "/cache/");
settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
this.js_interface = new IITC_JSInterface(c);
this.addJavascriptInterface(js_interface, "android");

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

@ -6,14 +6,17 @@ import android.content.SharedPreferences;
import android.content.res.AssetManager;
import android.net.Uri;
import android.net.http.SslError;
import android.os.Environment;
import android.preference.PreferenceManager;
import android.util.Log;
import android.webkit.SslErrorHandler;
import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Toast;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
@ -27,10 +30,13 @@ public class IITC_WebViewClient extends WebViewClient {
private WebResourceResponse iitcjs;
private String js = null;
private String dev_path = null;
Context context;
public IITC_WebViewClient(Context c) {
this.context = c;
this.dev_path = Environment.getExternalStorageDirectory().getPath() +
"/IITC_Mobile/dev/";
try {
loadIITC_JS(c);
} catch(IOException e) {
@ -39,7 +45,9 @@ public class IITC_WebViewClient extends WebViewClient {
}
public String getIITCVersion() {
String header = js.substring(js.indexOf("==UserScript=="), js.indexOf("==/UserScript=="));
String header = "";
if (js != null)
header = js.substring(js.indexOf("==UserScript=="), js.indexOf("==/UserScript=="));
// remove new line comments
header = header.replace("\n//", "");
// get a list of key-value
@ -58,18 +66,36 @@ public class IITC_WebViewClient extends WebViewClient {
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(c);
String iitc_source = sharedPref.getString("pref_iitc_source", "local");
String js = "";
// if developer options are enabled, load all iitc script from external storage
if (sharedPref.getBoolean("pref_dev_checkbox", true)) {
File js_file = new File(dev_path + "total-conversion-build.user.js");
if (!js_file.exists()) {
Toast.makeText(context, "File " + dev_path +
"total-conversion-build.user.js not found. " +
"Disable developer options or add iitc files " +
"to the dev folder.", Toast.LENGTH_LONG).show();
} else {
Toast.makeText(context, "Developer options enabled", Toast.LENGTH_SHORT).show();
}
Scanner s = null;
s = new Scanner(js_file).useDelimiter("\\A");
if (s != null) js = s.hasNext() ? s.next() : "";
} else {
// load iitc script from web or asset folder
if (iitc_source.contains("http")) {
URL url = new URL(iitc_source);
js = new Scanner(url.openStream(), "UTF-8").useDelimiter("\\A").next();
} else {
InputStream input;
input = c.getAssets().open("iitc.js");
input = c.getAssets().open("total-conversion-build.user.js");
int size = input.available();
byte[] buffer = new byte[size];
input.read(buffer);
input.close();
js = new String(buffer);
}
}
this.js = js;
@ -101,6 +127,7 @@ public class IITC_WebViewClient extends WebViewClient {
// get the plugin preferences
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
Set<String> plugin_list = sharedPref.getStringSet("pref_plugins", null);
boolean dev_enabled = sharedPref.getBoolean("pref_dev_checkbox", true);
// iterate through all enabled plugins and load them
if (plugin_list != null) {
@ -114,6 +141,13 @@ public class IITC_WebViewClient extends WebViewClient {
Scanner s = null;
String src = "";
try {
// load plugins from external storage if dev options are enabled
if (dev_enabled) {
File js_file = new File(dev_path + "plugins/" + plugin_array[i]);
s = new Scanner(js_file).useDelimiter("\\A");
}
else
// load plugins from asset folder
s = new Scanner(am.open("plugins/" + plugin_array[i])).useDelimiter("\\A");
} catch (IOException e2) {
// TODO Auto-generated catch block
@ -127,15 +161,22 @@ public class IITC_WebViewClient extends WebViewClient {
// inject the user location script if enabled in settings
if (sharedPref.getBoolean("pref_user_loc", false))
enableTracking(view);
enableTracking(view, dev_enabled);
}
public void enableTracking(WebView view) {
public void enableTracking(WebView view, boolean dev_enabled) {
Log.d("iitcm", "enable tracking...");
AssetManager am = context.getAssets();
Scanner s = null;
String src = "";
try {
// load plugin from external storage if dev options are enabled
if (dev_enabled) {
File js_file = new File(dev_path + "user-location.user.js");
s = new Scanner(js_file).useDelimiter("\\A");
}
else
// load plugin from asset folder
s = new Scanner(am.open("user-location.user.js")).useDelimiter("\\A");
} catch (IOException e2) {
// TODO Auto-generated catch block