Commit Graph

1766 Commits

Author SHA1 Message Date
Andrew Grieve
c052f40ef8 Remove onKey* from CordovaWebView interface (these exist on View already) 2014-06-20 16:09:14 -04:00
Andrew Grieve
98246c0e35 Add a whitelist to PluginManager to be used by App Harness
App Harness needs a way to restrict which plugins get loaded for
embedded apps. This seemed like the simplest way, although a better
API would be to have PluginManager recieve the list of PluginEntry.
2014-06-20 12:34:08 -04:00
Joe Bowser
8ac067da89 Rethinking the URI helper 2014-06-19 13:20:44 -07:00
Andrew Grieve
3a9898a6a6 CB-6971 Fix infinite recursion for onReceiveError 2014-06-18 13:20:47 -04:00
Ian Clelland
fa189b3234 CB-3445: Add an initial set of Gradle build scripts
These scripts will build an android project, in debug and release mode.
They also support additional library projects, such as Crosswalk, being
added to libraries.gradle (and settings.gradle). A flag can be set in
libraries.gradle to enable multi-architecture builds.
2014-06-17 17:36:26 -04:00
Joe Bowser
3b27cd093b CB-6873: Removing from cordova-android, still in the camera plugin 2014-06-17 11:22:42 -07:00
Marcel Kinard
483babe3bc Add documentation referencing other implementation. 2014-06-09 15:50:20 -04:00
Andrew Grieve
6abb9da88a Merge branch 'master' into 4.0.x
Conflicts:
	bin/templates/project/custom_rules.xml
	framework/src/org/apache/cordova/CordovaWebView.java
	test/src/org/apache/cordova/test/junit/MessageTest.java
2014-06-08 22:54:21 -04:00
Andrew Grieve
b407641049 CB-6851 Deprecate WebView.sendJavascript() 2014-06-08 22:47:41 -04:00
Andrew Grieve
d5e8807756 Set version to 4.0.0-dev 2014-06-06 15:00:41 -04:00
Joe Bowser
eb623a84d5 Trivial spelling fix in comments when reading CordovaResourceApi 2014-06-04 11:13:37 -07:00
Joe Bowser
07290277ba CB-6818: I want to remove this code, because Square didn't do their headers properly 2014-06-03 15:22:10 -07:00
Ian Clelland
b42faea2eb Merge branch 'pluggable_webview' into 4.0.x 2014-05-29 11:20:35 -04:00
Joe Bowser
635a6279a9 Renaming app plugin CoreAndroid to avoid confusion. It is now trivial to fix the JS away from App, but this will have to be a 4.x change 2014-05-26 13:11:27 -07:00
Joe Bowser
404d3e0959 CB-6315: Wrapping this so it runs on the UI thread 2014-05-23 11:31:13 -07:00
Marcel Kinard
1d0a1664e6 CB-6707 Update minSdkVersion to 10 consistently
Update minSdkVersion in the AndroidManifest for the cordova.jar and the
test project.
2014-05-23 11:30:58 -07:00
Martin Gonzalez
410afbf9a1 CB-5652 make visible cordova version
Log the cordova version using version string from CordovaWebView.java

This closes #101
2014-05-23 11:30:58 -07:00
Steven Gill
aaddfa6f3a Update JS snapshot to version 3.6.0-dev (via coho) 2014-05-23 11:30:58 -07:00
Joe Bowser
2d9a16e857 Update JS snapshot to version 3.6.0-dev (via coho) 2014-05-23 11:30:58 -07:00
Joe Bowser
1dcba51092 Set VERSION to 3.6.0-dev (via coho) 2014-05-23 11:30:57 -07:00
Joe Bowser
629e05b7b1 CB-6315: Wrapping this so it runs on the UI thread 2014-05-22 12:00:42 -07:00
Marcel Kinard
0b5bf0c098 CB-6707 Update minSdkVersion to 10 consistently
Update minSdkVersion in the AndroidManifest for the cordova.jar and the
test project.
2014-05-20 07:00:21 -04:00
Martin Gonzalez
1deefa48ee CB-5652 make visible cordova version
Log the cordova version using version string from CordovaWebView.java

This closes #101
2014-05-19 11:10:58 -04:00
Ian Clelland
97008305ff Merge branch 'master' into pluggable_webview
Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java
2014-05-15 15:59:11 -04:00
Ian Clelland
1a17083e8c Add more required methods on CordovaWebView interface 2014-05-15 15:56:10 -04:00
Joe Bowser
b6664cc859 Added two more required methods to CordovaWebView to get the Junit tests running, removed tests that make no sense 2014-05-14 11:09:21 -07:00
Steven Gill
50c4aef873 Update JS snapshot to version 3.6.0-dev (via coho) 2014-05-08 15:32:28 -07:00
Joe Bowser
cf42d31214 Update JS snapshot to version 3.6.0-dev (via coho) 2014-05-06 15:51:17 -07:00
Joe Bowser
00caa1c0a0 Set VERSION to 3.6.0-dev (via coho) 2014-05-06 15:51:14 -07:00
Ian Clelland
e595c313a1 Use correct client object in recent versions of android again 2014-05-02 10:29:53 -04:00
Ian Clelland
955da2e360 Clean up merge commit
Reinstate fix for github issue #96 (b715d20)
Re-remove extra calls to set up client objects (8e31ef7b)
Reinstate license header in CordovaChromeClient.java
2014-05-02 10:22:38 -04:00
Joe Bowser
04b3fc0268 Outsmarted by vim, needed Eclipse to clean this up 2014-04-30 15:09:54 -07:00
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
Josh Soref
74ea6bf00a Spelling fixes 2013-12-05 12:20:58 -05:00
Joe Bowser
7c566c36f4 Update JS snapshot to version 3.4.0-dev (via coho) 2013-12-03 15:44:23 -08:00
Joe Bowser
dbbe038939 Set VERSION to 3.4.0-dev (via coho) 2013-12-03 15:44:21 -08:00
ignisvulpis
e3430a916c prevent ClassNotFound exception for emtpy class name
Signed-off-by: Joe Bowser <bowserj@apache.org>
2013-12-03 15:09:32 -08:00
Joe Bowser
ea1f041e11 CB-5487: Remote Debugging is on when your Android app is debuggable. 2013-11-29 15:54:07 -08:00
Joe Bowser
46e7359372 Making the object less chatty 2013-11-29 14:28:11 -08:00
Joe Bowser
e339a7583c CB-5445: Adding onScrollChanged and the ScrollEvent object. (Forgot to add the WebView) 2013-11-29 14:28:10 -08:00
Joe Bowser
0b7570c9ee CB-5445: Adding onScrollChanged and the ScrollEvent object 2013-11-29 14:28:10 -08:00
Joe Bowser
a85acfcfc5 Updated CordovaWebView to experiment with onScrollChanged messages 2013-11-29 14:28:10 -08:00
Joe Bowser
f1cfe2b07b Thanks for Benn Mapes for making this process easy. Updating the Android API level. 2013-11-27 12:09:17 -08:00
Marcel Kinard
6160ca6e30 CB-5490: add javadoc target to ant script
- add javadoc target to ant script. It must be invoked explicitly to run.
- ignore the generated javadoc html directories.
- clean up javadoc errors in source files.
- upon invoking 'clean' target, erase generated jar and javadoc
2013-11-26 13:06:28 -05:00
Marcel Kinard
b621c3e4c4 CB-5471: add deprecation javadoc/annotation 2013-11-26 12:05:23 -05:00
Marcel Kinard
64d2ae9ad4 Add javadoc comments to source classes 2013-11-22 17:42:58 -05:00
Andrew Grieve
8b379cbf56 Remove Application settings from framework/AndroidManifest.xml
They aren't needed since framework is a library.
2013-11-15 12:01:12 -05:00
Marcel Kinard
b895a0c335 CB-5346 Fix and cleanup broken Android unit test
- Found stale cordova.js in the test project. Changed ant script to copy in
  a fresh one in the pre-build stage. Removed stale copies from git, added
  to .gitignore. This is what was causing the test failure when sending
  javascript to the webview.
- Found almost-stale copy of device plugin, did the same as above.
- Fixed spacing in log messages in CordovaWebView.
- Updated README.md with current information.
- Removed dollar signs that were previously accidently appended to the license.
- Added cordova version to html pages, next to the other metadata.
- Fix incorrect separator in the viewport meta tag.
- Changed old-style <log> tag to <preference name="loglevel"> in config.xml.
- In BackButtonMultiPageTest, increased the TIMEOUT so the deviceready event
  can trigger the referenced javascript, improved the setup() method to
  explicitly load the starting point.
2013-11-11 16:19:01 -05:00
Josh Soref
c5767eb545 CB-5307 Remove references to Callback and Incubator 2013-11-07 09:02:17 -05:00
Joe Bowser
6856b02aa7 Set VERSION to 3.3.0-dev (via coho) 2013-11-06 15:06:19 -08:00
Marcel Kinard
4e1156e083 CB-5284 Fixing the version from coho
Fixing the hardcoded versions, it got auto-incremented by accident.
2013-11-05 14:43:01 -05:00