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

moved user location plugin back to assets root so that it's not displayed in the iitc plugins section

Browse Source
This commit is contained in:
Philipp Schaefer 2013-10-11 11:29:55 +02:00
parent 4eb8757c45
commit 7d60f93472
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.py
View File

@ -247,6 +247,8 @@ if buildMobile:
except: except:
pass pass
shutil.copy(os.path.join(outDir,"total-conversion-build.user.js"), "mobile/assets/total-conversion-build.user.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")
# also copy plugins # also copy plugins
try: try:
shutil.rmtree("mobile/assets/plugins") shutil.rmtree("mobile/assets/plugins")
@ -258,9 +260,6 @@ if buildMobile:
'force-https*', 'privacy-view*', 'speech-search*', 'force-https*', 'privacy-view*', 'speech-search*',
'basemap-cloudmade*', 'scroll-wheel-zoom-disable*')) 'basemap-cloudmade*', 'scroll-wheel-zoom-disable*'))
# copy the user location script into the mobile folder.
shutil.copy(os.path.join(outDir,"user-location.user.js"), "mobile/assets/plugins/user-location.user.js")
if buildMobile != 'copyonly': if buildMobile != 'copyonly':
# now launch 'ant' to build the mobile project # now launch 'ant' to build the mobile project

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

@ -191,8 +191,10 @@ public class IITC_WebViewClient extends WebViewClient {
} }
// inject the user location script if enabled in settings // inject the user location script if enabled in settings
if (sharedPref.getBoolean("pref_user_loc", false)) if (sharedPref.getBoolean("pref_user_loc", false)) {
loadJS(path + "user-location.user.js", !dev_enabled, view); path = path.replace("plugins/", "");
loadJS(path + "user-location.user.js", !dev_enabled, view);
}
} }
// read a file into a string // read a file into a string