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

Merge branch 'master' into ZasoGD-master

Browse Source
This commit is contained in:
Philipp Schaefer 2013-06-14 12:03:05 +02:00
commit 9df120ece1
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/smartphone.js
View File

@ -90,11 +90,11 @@ window.runOnSmartphonesAfterBoot = function() {
// this is a hack, accessing Leaflet’s private _container is evil // this is a hack, accessing Leaflet’s private _container is evil
$(this._container).on('taphold', function() { $(this._container).on('taphold', function() {
window.renderPortalDetails(guid);
if (typeof android !== 'undefined' && android && android.portalLongPressed) { if (typeof android !== 'undefined' && android && android.portalLongPressed) {
android.portalLongPressed(); android.portalLongPressed();
} else { } else {
window.renderPortalDetails(guid); window.smartphone.sideButton.click();
window.smartphone.sideButton.click();
} }
}); });
}); });

4
mobile/src/com/cradle/iitc_mobile/IITC_JSInterface.java
View File

@ -76,8 +76,8 @@ public class IITC_JSInterface {
} }
@JavascriptInterface @JavascriptInterface
public void dialogOpened(String id) { public void dialogOpened(String id, boolean open) {
((IITC_Mobile) context).dialogOpened(id); ((IITC_Mobile) context).dialogOpened(id, open);
} }
// get layers and list them in a dialog // get layers and list them in a dialog

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

@ -271,7 +271,6 @@ public class IITC_Mobile extends Activity {
if (!dialogStack.isEmpty()) { if (!dialogStack.isEmpty()) {
int last = dialogStack.size() - 1; int last = dialogStack.size() - 1;
String id = dialogStack.get(last); String id = dialogStack.get(last);
dialogStack.remove(last);
iitc_view.loadUrl("javascript: " + iitc_view.loadUrl("javascript: " +
"var selector = $(window.DIALOGS['" + id + "']); " + "var selector = $(window.DIALOGS['" + id + "']); " +
"selector.dialog('close'); " + "selector.dialog('close'); " +

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

@ -140,9 +140,21 @@ public class IITC_WebViewClient extends WebViewClient {
*/ */
@Override @Override
public void onReceivedLoginRequest(WebView view, String realm, String account, String args) { public void onReceivedLoginRequest(WebView view, String realm, String account, String args) {
Log.d("iitcm", "Login requested: " + realm + " " + account + " " + args);
((IITC_Mobile) context).onReceivedLoginRequest(this, view, realm, account, args); ((IITC_Mobile) context).onReceivedLoginRequest(this, view, realm, account, args);
} }
@Override
public void onPageFinished(WebView view, String url) {
if (url.contains("accounts.google.com")) {
Log.d("iitcm", "reload after login");
IITC_Mobile main_activity = ((IITC_Mobile) context);
main_activity.loadUrl(main_activity.intel_url);
return;
}
super.onPageFinished(view, url);
}
// parse all enabled iitc plugins // parse all enabled iitc plugins
// returns a string containing all plugins without their wrappers // returns a string containing all plugins without their wrappers
public String parsePlugins() { public String parsePlugins() {