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

Merge branch 'dialogs' of https://github.com/fkloft/ingress-intel-total-conversion into fkloft-dialogs

Browse Source
This commit is contained in:
Jon Atkins 2015-04-10 00:08:22 +01:00
commit a6f23ada6a
3 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mobile/src/com/cradle/iitc_mobile/IITC_WebChromeClient.java
View File

@ -2,6 +2,8 @@ package com.cradle.iitc_mobile;
import android.webkit.ConsoleMessage; import android.webkit.ConsoleMessage;
import android.webkit.GeolocationPermissions; import android.webkit.GeolocationPermissions;
import android.webkit.JsPromptResult;
import android.webkit.JsResult;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
import android.webkit.WebView; import android.webkit.WebView;
@ -52,4 +54,26 @@ public class IITC_WebChromeClient extends WebChromeClient {
return super.onConsoleMessage(message); return super.onConsoleMessage(message);
} }
@Override
public boolean onJsAlert(final WebView view, final String url, final String message, final JsResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.ALERT, view, url, message, null, result).shouldInterrupt();
}
@Override
public boolean onJsBeforeUnload(final WebView view, final String url, final String message, final JsResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.UNLOAD, view, url, message, null, result).shouldInterrupt();
}
@Override
public boolean onJsConfirm(final WebView view, final String url, final String message, final JsResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.CONFIRM, view, url, message, null, result).shouldInterrupt();
}
@Override
public boolean onJsPrompt(final WebView view, final String url, final String message, final String defaultValue,
final JsPromptResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.PROMPT, view, url, message, defaultValue, result)
.shouldInterrupt();
}
} }

31
mobile/src/com/cradle/iitc_mobile/IITC_WebChromeLollipop.java
View File

@ -1,31 +0,0 @@
package com.cradle.iitc_mobile;
import android.webkit.JsPromptResult;
import android.webkit.JsResult;
import android.webkit.WebView;
public class IITC_WebChromeLollipop extends IITC_WebChromeClient {
public IITC_WebChromeLollipop(final IITC_Mobile iitc) {
super(iitc);
}
@Override
public boolean onJsAlert(final WebView view, final String url, final String message, final JsResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.ALERT, view, url, message, null, result).shouldInterrupt();
}
@Override
public boolean onJsBeforeUnload(final WebView view, final String url, final String message, final JsResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.UNLOAD, view, url, message, null, result).shouldInterrupt();
}
@Override
public boolean onJsConfirm(final WebView view, final String url, final String message, final JsResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.CONFIRM, view, url, message, null, result).shouldInterrupt();
}
@Override
public boolean onJsPrompt(final WebView view, final String url, final String message, final String defaultValue, final JsPromptResult result) {
return new IITC_JsDialogHelper(IITC_JsDialogHelper.PROMPT, view, url, message, defaultValue, result).shouldInterrupt();
}
}

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

@ -86,11 +86,7 @@ public class IITC_WebView extends WebView {
} }
}; };
// if (Build.VERSION.SDK_INT > Build.VERSION_CODES.KITKAT) { mIitcWebChromeClient = new IITC_WebChromeClient(mIitc);
mIitcWebChromeClient = new IITC_WebChromeLollipop(mIitc);
// } else {
// mIitcWebChromeClient = new IITC_WebChromeClient(mIitc);
// }
setWebChromeClient(mIitcWebChromeClient); setWebChromeClient(mIitcWebChromeClient);
mIitcWebViewClient = new IITC_WebViewClient(mIitc); mIitcWebViewClient = new IITC_WebViewClient(mIitc);
setWebViewClient(mIitcWebViewClient); setWebViewClient(mIitcWebViewClient);