Joe Bowser
105ccc81a5
This is an ugly merge commit, because the rebase made even less sense.
...
This should add the old setProperty methods required for the tests. We
decided to not deprecate them. I don't make a habit of doing merge
commits, due to their destructive nature, but I think I might have
merged too much stuff in.
Merge branch 'pluggable_webview' of https://git-wip-us.apache.org/repos/asf/cordova-android into pluggable_webview
Conflicts:
framework/src/org/apache/cordova/AndroidChromeClient.java
framework/src/org/apache/cordova/AndroidWebView.java
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-04-30 14:59:40 -07:00
Joe Bowser
3571307df5
Adding setIntegerProperty, setBooleanProperty and setStringProperty back, due to possible demand, and due to the fact that I don't want to rewrite my tests
2014-04-30 11:33:26 -07:00
Ian Clelland
df05f3a3c0
Try other constructors besides first
2014-04-29 22:50:12 -04:00
Ian Clelland
8e31ef7be6
Defer construction of client objects to WebView
2014-04-29 22:50:12 -04:00
Joe Bowser
f4555f7c96
Removing the xwalk_core_library reference so we can use this with MozillaView
2014-04-29 22:50:11 -04:00
Ningxin Hu
8408da55ea
Add getView() API into CordovaWebView.
...
This API is to get the actual View.
The concrete webview implementation can use compositing instead of extending
underlying webview.
2014-04-29 22:50:11 -04:00
Joe Bowser
bd806a34d8
Removing XWalkWebView and making it a plugin component
2014-04-29 22:50:11 -04:00
Joe Bowser
2f7e833a79
Got the bridge to work with Crosswalk
2014-04-29 22:50:11 -04:00
Joe Bowser
c17503ab78
w00t! Managed to get XWalk to work. Next Step: Make it installable
...
like a Cordova Plugin!
2014-04-29 22:50:11 -04:00
Joe Bowser
19f76d34db
Hurray! It runs! Now that we have the default WebView working, it's time
...
to make things a little more pluggable.
2014-04-29 22:50:11 -04:00
Joe Bowser
25c8b2fabb
Removing the deprecated setAttribute methods to clean up the codebase
2014-04-29 22:44:05 -04:00
Ningxin Hu
7a5405d2ab
Delegate making WebViewClient and ChromeClient to webview engine.
...
Revert the change of webview preference name.
2014-04-24 09:42:51 +08:00
Ningxin Hu
dbfc292353
Make correct webview client and chrome client for specific webview engine.
...
It changes the webview preference naming from full name to prefix, since the
prefix is also used to construct the name of WebView, WebViewClient and
ChromeClient.
For example, for Crosswalk webview, config.xml contains:
<preference name="webView" value="org.apache.cordova.engine.crosswalk.XWalkCordova" />
2014-04-23 16:33:31 +08:00
Joe Bowser
b9a24f00ad
Removing the xwalk_core_library reference so we can use this with MozillaView
2014-04-23 14:31:30 -07:00
Ningxin Hu
9d1c72cc07
Add getView() API into CordovaWebView.
...
This API is to get the actual View.
The concrete webview implementation can use compositing instead of extending
underlying webview.
2014-04-21 15:22:19 +08:00
Andrew Grieve
0ec8f5d283
Add JavaDoc for CordovaResourceApi
2014-04-17 15:51:59 -04:00
Ian Clelland
b872df0f31
CB-6388: Handle binary data correctly in LOAD_URL bridge
2014-04-02 13:42:19 -04:00
Ian Clelland
0add4af208
Update JS snapshot to version 3.5.0-dev-81f9a00
2014-04-02 13:42:19 -04:00
hadeslee
b715d20385
Remove incorrect usage of AlertDialog.Builder.create
...
AlertDialog.Builder.show() will create an AlertDialog before it show. This is the source code snippet:
/**
* Creates a {@link AlertDialog} with the arguments supplied to this builder and
* {@link Dialog#show()}'s the dialog.
*/
public AlertDialog show() {
AlertDialog dialog = create();
dialog.show();
return dialog;
}
github: close #96
2014-03-28 13:40:43 -04:00
Andrew Grieve
79e313a0c0
Catch uncaught exceptions in from plugins and turn them into error responses.
...
When a plugin throws an unchecked exception, we're not catching it
anywhere and so the error callback is not being called.
This change adds a try/catch to catch such exceptions.
2014-03-17 11:58:14 -07:00
Joe Bowser
b37492644c
Removing XWalkWebView and making it a plugin component
2014-03-12 15:04:28 -07:00
Joe Bowser
04a792a8c2
Got the bridge to work with Crosswalk
2014-03-10 14:39:43 -07:00
Joe Bowser
35ec24c3f0
w00t! Managed to get XWalk to work. Next Step: Make it installable
...
like a Cordova Plugin!
2014-03-07 15:03:22 -08:00
Andrew Grieve
9a00ccdacc
Catch uncaught exceptions in from plugins and turn them into error responses.
...
When a plugin throws an unchecked exception, we're not catching it
anywhere and so the error callback is not being called.
This change adds a try/catch to catch such exceptions.
2014-03-06 21:27:44 -05:00
Joe Bowser
61b23677d1
Hurray! It runs! Now that we have the default WebView working, it's time
...
to make things a little more pluggable.
2014-03-05 15:50:02 -08:00
Joe Bowser
90037dc6cd
Removing the deprecated setAttribute methods to clean up the codebase
2014-03-04 15:02:30 -08:00
Andrew Grieve
a2f8c9c75b
CB-6047 Fix online sometimes getting in a bad state on page transitions.
...
The online bridge toggles between on & off. Turns out that starting with
Android 4.3, navigation resets the online state, so the code had a 50/50
chance of being caught in the wrong state.
We now forcefully reset the online state on page transitions.
2014-02-26 20:23:07 -05:00
Andrew Grieve
5fb83e7f52
Add another convenience overload for CordovaResourceApi.copyResource
2014-02-26 20:20:10 -05:00
Andrew Grieve
dd6bf568d1
Update framework's .classpath to what Eclipse wants it to be.
2014-02-26 20:18:35 -05:00
Andrew Grieve
448071b02d
Fix NPE when POLLING bridge mode is used.
2014-02-18 22:11:38 -05:00
Joe Bowser
26a3f6ddc3
Update JS snapshot to version 3.5.0-dev (via coho)
2014-02-14 13:52:31 -08:00
Andrew Grieve
7741312673
CB-5398 Apply KitKat content URI fix to all content URIs
2014-02-14 11:02:17 -05:00
Andrew Grieve
954a1723f1
CB-5398 Work-around for KitKat content: URLs not rendering in <img> tags
2014-02-13 16:10:40 -05:00
arudenko
d260d0c182
Added Log.e when Config is not initialised but accessed
2014-02-08 21:24:20 -05:00
Ian Clelland
137eb40fab
CB-5395: Make scheme and host (but not path) case-insensitive in whitelist
2014-02-07 15:02:09 -05:00
Andrew Grieve
af440460e1
Fix broken build from prev. commit (copy & paste error?)
2014-02-04 10:00:58 -05:00
Andrew Grieve
a5c8472a37
Ignore multiple onPageFinished() callbacks & onReceivedError due to stopLoading()
...
I believe this happens only when using custom schemes.
2014-02-04 00:12:11 -05:00
Joe Bowser
dfae37421d
Removing addJavascriptInterface support from all Android versions lower than 4.2 due to security vulnerability
2014-02-03 10:11:53 -08:00
Andrew Grieve
ac2034561d
CB-5917 Add a loadUrlIntoView overload that doesn't recreate plugins.
2014-01-28 10:30:39 -05:00
Andrew Grieve
c42cd4233d
Use thread pool for load timeout.
2014-01-28 10:30:39 -05:00
Joe Bowser
e361f88501
Update JS snapshot to version 3.5.0-dev (via coho)
2014-01-22 16:30:05 -08:00
Joe Bowser
708c042b61
Set VERSION to 3.5.0-dev (via coho)
2014-01-22 16:30:02 -08:00
Andrew Grieve
e16cab6b9c
CB-5799 Update version of OkHTTP to 1.3
2014-01-15 11:36:43 -05:00
Andrew Grieve
1cee6e309b
Silence excessive logging from scroll events
2014-01-13 12:07:54 -05:00
Joe Bowser
0777a660bf
CB-5504: Adding onDestroy to app plugin to deregister telephonyReceiver
2014-01-08 13:12:00 -08:00
Andrew Grieve
7951eee8a3
Fix incorrect MIME type for .js files loaded through CordovaResourceAPI.
...
This fixes devtools complaining about .js files being served as "text/plain"
when they have gone through remapUrl().
2013-12-23 15:04:54 -05:00
Andrew Grieve
59c8e8b46e
CB-5592 Set MIME type for openExternal when scheme is file:
2013-12-20 11:17:24 -05:00
Marcel Kinard
1482c07ae4
CB-5489: clean up docs for deprecated methods
...
- fixed grammer in log message in Config.java
- updated the class javadoc in CordovaActivity to catch up to reality: use config.xml instead of set*Property() methods.
- added deprecation message for SetFullscreen
2013-12-14 08:02:58 -05:00
Joe Bowser
adba84ae6a
CB-5504: Moving code to the App plugin inside Cordova, the place where the grey area beween plugin and platform exists
2013-12-09 14:03:22 -08:00
Håkon Nilsen
28c10dba09
CB-5481 Fix for Cordova trying to get config.xml from the wrong namespace
2013-12-05 12:45:34 -05:00
