Joe Bowser
53dae45430
Fixed the SecureRandom so it only returns positive values
2014-10-17 15:30:28 -07:00
Joe Bowser
16343ffe70
Undoing change to Math.random() for now, this creates a weird bug
2014-10-17 13:52:33 -07:00
Joe Bowser
b37498d5f6
Replacing Math.random() with something a little more random.
2014-10-14 10:11:09 -07:00
Andrew Grieve
2af8daff1d
Merge branch 'master' into 4.0.x (multipart PluginResult)
2014-10-07 15:18:07 -04:00
Rui Zhao
fbeb379f1b
CB-7707 Added multipart PluginResult ( close #125 )
...
Corresponds to cordova-js commit: a1f866606b3
2014-10-07 15:17:56 -04:00
Andrew Grieve
7f4d5aeb0e
Merge branch 'master' into 4.0.x (move preference activation, alert dialog leak)
...
Conflicts:
framework/src/org/apache/cordova/AndroidChromeClient.java
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
test/src/org/apache/cordova/test/menus.java
closes #123
2014-10-04 15:30:25 -04:00
Martin Gonzalez
890e12c306
CB-6837 Fix leaked window when hitting back button while alert being rendered
...
Keep track of the last AlertDialog showed.
The last dialog showed that is rendered while hitting back button it
causes a leaked window.
Instead of perform a full track of all dialogs created, only destroy the
last one showed, this fixes the problem.
close #122
2014-10-04 14:44:06 -04:00
Marcel Kinard
c255a84941
CB-7674 move preference activation back into onCreate()
...
The preference creation actually needs to be before
super.onCreate(savedInstance) in order to avoid the exception
"requestFeature() must be called before adding content". Also ran into an
issue in the native tests "Whitelist" and "User WebView/Client/Chrome" where
it would throw an exception that the CordovaWebView appView already had
a parent and needed to be removed from that parent before the invocation
to root.addView(appView). So I conditionally remove the wrong parent.
Also made a change to the native tests so the menus test would work.
I also put super.init() back into the template, though invoking it is optional
as loadUrl will call it automatically if needed.
2014-09-30 19:38:34 -04:00
Steven Gill
cdfa13b265
Update JS snapshot to version 3.7.0-dev (via coho)
2014-09-29 14:59:07 -07:00
Andrew Grieve
363fc8deb5
Merge branch 'master' into 4.0.x (gradle plugin template)
...
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
2014-09-22 22:28:59 -04:00
Max Woghiren
ddac192c4a
Added gradle distribution URL updating.
...
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
2014-09-22 22:27:43 -04:00
Andrew Grieve
69a03c2e16
CB-7512 Use a standard build.gradle for all plugins
...
Plugins can extend it by providing a "build-extras.gradle"
2014-09-22 22:27:43 -04:00
Andrew Grieve
2b128b85f7
CB-7512 Make gradle build only a single config for sub-libraries (release vs debug)
2014-09-22 20:54:28 -04:00
Max Woghiren
b09f973231
Added gradle distribution URL updating.
2014-09-22 16:47:01 -04:00
Andrew Grieve
8f27b2ab56
Merge branch 'master' into 4.0.x (gradle fixes)
2014-09-16 13:02:55 -04:00
Andrew Grieve
00f6d30e08
CB-7512 Change gradle android plugins from 0.10 -> 0.12
2014-09-16 13:00:27 -04:00
Ian Clelland
4c1efe7ad4
Merge branch 'master' into 4.0.x
2014-09-15 12:16:03 -04:00
Marcel Kinard
f221441877
Update JS snapshot to version 3.7.0-dev (via coho)
2014-09-12 16:34:06 -04:00
Ian Clelland
dd5a337a49
Merge branch 'master' into 4.0.x
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-09-11 10:18:35 -04:00
Ian Clelland
51e634ccb4
Merge branch 'master' into 4.0.x (up to 3.7.0-dev)
...
Conflicts:
VERSION
bin/templates/cordova/version
framework/src/org/apache/cordova/CordovaWebView.java
package.json
test/src/org/apache/cordova/test/basicauth.java
test/src/org/apache/cordova/test/menus.java
2014-09-11 10:16:46 -04:00
Ian Clelland
31b1a821ca
Merge branch 'master' into 4.0.x (External whitelist changes)
2014-09-11 10:08:45 -04:00
Ian Clelland
c8bbdb23de
CB-7512: Determine SDK and build tools version dynamcally at build time
2014-09-10 10:57:43 -04:00
Joe Bowser
8354651059
CB-7463: Looked at the Apache BigTop git, gradle uses C-style comments
2014-09-04 10:49:43 -07:00
Joe Bowser
4dc32e194b
CB-7460: Fixing bug with KitKat where the background colour would override the CSS colours on the application
2014-09-03 15:42:39 -07:00
Steven Gill
f20708a5e7
Update JS snapshot to version 3.7.0-dev (via coho)
2014-08-29 16:34:17 -07:00
Steven Gill
91cf78f183
Set VERSION to 3.7.0-dev (via coho)
2014-08-29 16:34:12 -07:00
Marcel Kinard
c6ccde0558
CB-7385 update cordova.js for testing prior to branch/tag
2014-08-27 09:04:32 -04:00
Ian Clelland
2e3e4ec3b2
Merge branch 'CB-7291'
2014-08-26 15:25:41 -04:00
Ian Clelland
6e222c3938
CB-7291: Restrict meaning of "*" in internal whitelist to just http and https
2014-08-26 15:23:24 -04:00
Ian Clelland
3b3bd9b6c9
CB-7291: Only add file, content and data URLs to internal whitelist
2014-08-21 16:27:48 -04:00
Ian Clelland
4e3331ba66
CB-7291: Add defaults to external whitelist
2014-08-21 16:27:48 -04:00
Ian Clelland
8aa813b862
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-08-18 09:48:31 -04:00
Joe Bowser
a7ccb9243d
Merging latest master, including new tests
2014-08-14 14:20:49 -07:00
Ian Clelland
8b55a16986
CB-7291: Add external-launch-whitelist and use it for filtering intent launches
2014-08-12 11:26:47 -04:00
Ian Clelland
f9b8f9a45f
CB-7159: Fix setBackgroundColor() call to support 4.0.x view classes
2014-08-11 13:25:21 -04:00
Andrew Grieve
41125ea1e2
CB-7261 Fix setNativeToJsBridgeMode sometimes crashing when switching to ONLINE_EVENT
2014-08-07 16:18:56 -04:00
Martin Bektchiev
73219bf2d2
CB-7265 Fix crash when navigating to custom protocol (introduced in 3.5.1)
...
Conflicts:
framework/src/org/apache/cordova/CordovaUriHelper.java
Github: close #111
2014-08-07 09:58:40 -04:00
Ian Clelland
d6eb723b7f
Filter out non-launchable intents
2014-08-06 09:55:03 -04:00
Ian Clelland
993d73762c
Handle unsupported protocol errors in webview better
2014-08-06 09:55:03 -04:00
Ian Clelland
955133f173
Extend whitelist to handle URLs without // chars
2014-07-31 08:11:40 -07:00
Andrey Kurdyumov
c2cafb4b45
CB-7172 Force window to have focus after resume
...
Workaround for some devices (Samsung Galaxy Note 3 at least)
github: close #108
2014-07-22 22:33:53 -04:00
Andrew Grieve
05868b541b
Merge branch 'master' into 4.0.x (background color)
2014-07-21 15:47:03 -04:00
Jan Velecký
67f474ef42
CB-7159 Set background color of webView as well as its parent
...
github: close #109 , close #110
2014-07-21 15:46:23 -04:00
Andrew Grieve
a40424e75c
Merge branch 'master' into 4.0.x (setButtonPlumbedToJs)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-18 13:49:04 -04:00
Andrew Grieve
cd6c0e1de9
CB-7018 Fix setButtonPlumbedToJs never un-listening
2014-07-18 13:46:29 -04:00
Andrew Grieve
a99c8219bd
Make private PluginManager.clearPluginObjects, .startupPlugins
2014-07-14 14:30:10 -04:00
Andrew Grieve
a03fdaba39
Merge branch 'master' into 4.0.x (undeprecate)
2014-07-14 14:28:56 -04:00
Andrew Grieve
92be0033a8
Undeprecate some just-deprecated symbols in PluginManager.
...
Forgot about custom engines again :(
2014-07-14 14:28:27 -04:00
Andrew Grieve
6f301576eb
Mark PluginEntry fields as final
...
Makes the intention of the class more clear, and the public fields less
bad.
2014-07-14 14:26:21 -04:00
Andrew Grieve
e2b3f76a10
Merge branch 'master' into 4.0.x (PluginEntry refactor)
...
Conflicts:
framework/src/org/apache/cordova/PluginEntry.java
framework/src/org/apache/cordova/PluginManager.java
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
2014-07-14 14:18:10 -04:00
Andrew Grieve
b934c1be6a
@Deprecate methods of PluginManager that were never meant to be public
2014-07-14 14:10:19 -04:00
Andrew Grieve
145b50a320
Move plugin instantiation and instance storing logic PluginEntry->PluginManager
...
Instantiation and storing of the instance should be owned privately by
PluginManager, not exposed via an unprotected public API. That said,
this refactoring does not make any breaking changes to the public API,
except for removing the createPlugin call in PluginEntry, which should
not be called by anyone other than PluginManager anyway.
2014-07-14 14:08:27 -04:00
Andrew Grieve
b277202838
Add PluginManager.setPluginEntries, delete setPluginWhitelist
2014-07-10 16:39:46 -04:00
Andrew Grieve
a4f6d9f6e7
Merge branch 'master' into 4.0.x (unbreak compile)
2014-07-10 15:14:57 -04:00
Andrew Grieve
9300e97d2b
Fix broken compile due to previous commit :(
2014-07-10 15:14:39 -04:00
Andrew Grieve
1d4aa44d3d
Merge branch 'master' into 4.0.x (CordovaPlugin.pluginInitialize tweak)
...
Conflicts:
framework/src/org/apache/cordova/CordovaPlugin.java
2014-07-10 15:05:40 -04:00
Andrew Grieve
3792f75281
Tweak CordovaPlugin.initialize method to be less deprecated.
...
Thinking here is that we need a while for both initialize and
pluginInitialize to exist before plugin authors would bother not using
the deprecated one anyways. Really, no harm in keeping both for some
time.
2014-07-10 15:03:53 -04:00
Andrew Grieve
b52fcb8aa9
Merge branch 'master' into 4.0.x (CordovaBridge tweaks)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
2014-07-10 11:36:58 -04:00
Andrew Grieve
a14c794255
Un-deprecate CordovaActivity.init() - it's needed to tweak prefs in onCreate
2014-07-10 11:36:20 -04:00
Andrew Grieve
aef96e95e8
Tweak log messages in CordovaBridge with bridgeSecret is wrong
2014-07-10 11:36:20 -04:00
Andrew Grieve
cc860804f6
Backport CordovaBridge from 4.0.x -> master
2014-07-10 10:43:37 -04:00
Andrew Grieve
f38c460588
Merge branch 'master' into 4.0.x (Unbreak unit tests)
...
Conflicts:
test/src/org/apache/cordova/test/junit/GapClientTest.java
test/src/org/apache/cordova/test/userwebview.java
test/src/org/apache/cordova/test/whitelist.java
2014-07-10 10:30:05 -04:00
Andrew Grieve
1c5b5e2ce6
Add non-String overloades for CordovaPreferences.set()
2014-07-10 10:23:26 -04:00
Andrew Grieve
9b9c59766f
Add back CordovaWebView.getUrl() - needed by tests & does make sense to have
2014-07-10 10:15:34 -04:00
Andrew Grieve
fc2a202afa
Log friendlier messages when bridge calls are recieved from previous page
2014-07-10 10:14:47 -04:00
Andrew Grieve
4b4b71ff32
CordovaActivity: don't create WebView until loadUrl() so that apps can tweak preferences after super.onCreate()
2014-07-10 10:10:38 -04:00
Andrew Grieve
9358838dab
Merge branch 'master' into 4.0.x (unit test tweaks)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-09 21:12:45 -04:00
Andrew Grieve
2f24e42dc1
Make CordovaWebview resilient to init() not being called (for backwards-compatibility)
...
This can happen when apps are not utilizing CordovaActivity and instead
creating their own CordovaWebView.
2014-07-09 21:08:29 -04:00
Andrew Grieve
a4d9f702e4
Merge branch 'master' into 4.0.x (cordova.js snapshot)
2014-07-09 13:32:10 -04:00
Andrew Grieve
ec47274fbd
Update cordova.js snapshot to work with bridge changes
2014-07-09 13:31:44 -04:00
Andrew Grieve
efcedabee0
Delete Cordova*Client classes, Create CordovaBridge, Delete more CordovaWebView symbols
...
Changes made in order to get xwalk working again
2014-07-09 09:29:33 -04:00
Andrew Grieve
25a7b66296
Delete deprecated methods from PluginManager
2014-07-08 14:46:05 -04:00
Andrew Grieve
ac194cd34f
Merge branch 'master' into 4.0.x (remove Config.* references)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-08 14:45:41 -04:00
Andrew Grieve
04ccb06e3f
Provide CordovaPlugin with CordovaPreferences. Add new Plugin.initialize()
...
This adds CordovaPlugin.initialize() (no args) and deprecates
CordovaPlugin.initialize(app, webView). This will allow us to refactor
more easily by using the package-private privateInitialize() to set
fields.
2014-07-08 14:26:21 -04:00
Andrew Grieve
d31ee20ba5
Convert usages of Config.* to use the non-static versions
2014-07-08 14:11:14 -04:00
Andrew Grieve
9b25d45b93
Change getProperty -> prefs.get* within CordovaActivity
2014-07-08 14:08:15 -04:00
Andrew Grieve
eca05e6bad
Delete deprecated symbols from CordovaActivity (4.0.x)
2014-07-08 12:15:34 -04:00
Andrew Grieve
84bf20152b
Merge branch 'master' into 4.0.x (CordovaUriHelper visibility)
2014-07-08 12:06:04 -04:00
Andrew Grieve
d51abdd73e
Make CordovaUriHelper class package-private
2014-07-08 12:05:41 -04:00
Andrew Grieve
200e9f1a8e
Delete deprecated classes: DirectoryManager, DroidGap, ExifHelper (4.0.x)
2014-07-08 12:04:40 -04:00
Andrew Grieve
7dc09b4019
Delete JSONUtils.java (in 4.0.x only)
2014-07-08 12:00:02 -04:00
Andrew Grieve
dbb196a17e
Delete url-filters logic (in 4.0.x branch only)
2014-07-08 11:58:56 -04:00
Andrew Grieve
05a95c699f
Merge branch 'master' into 4.0.x (Fix setPluginEntries)
2014-07-08 11:55:04 -04:00
Andrew Grieve
9ea8b2237a
Fix PluginManager.setPluginEntries not removing old entries
2014-07-08 11:54:38 -04:00
Andrew Grieve
9c5e340fb8
Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)
...
Conflicts:
bin/templates/cordova/defaults.xml
framework/res/xml/config.xml
framework/src/org/apache/cordova/CordovaWebView.java
2014-07-08 11:52:44 -04:00
Andrew Grieve
e86c2e5970
Move registration of App plugin from config.xml -> code
...
Less fragile this way.
2014-07-08 11:47:26 -04:00
Andrew Grieve
67006add53
Merge branch 'master' into 4.0.x (tweaks to setWebViewClient)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
framework/src/org/apache/cordova/CordovaWebViewClient.java
2014-07-07 16:38:50 -04:00
Andrew Grieve
caeb86843d
Make setWebViewClient an override instead of an overload. Delete Location-change JS->Native bridge mode (missed some of it).
2014-07-07 16:31:29 -04:00
Andrew Grieve
1571b26a65
Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
framework/src/org/apache/cordova/CordovaWebViewClient.java
framework/src/org/apache/cordova/PluginManager.java
2014-07-07 16:23:51 -04:00
Andrew Grieve
705991e5b0
Refactor: Use ConfigXmlParser in activity. Adds CordovaWebView.init()
...
This does subtly change the API surface due to CordovaWebView.init(),
but only minimally, and is backwards compatibly with the default
generated projects from prior versions.
2014-07-04 16:32:09 -04:00
Andrew Grieve
b636874bd9
Deprecate some convenience methods on CordovaActivity
...
They don't add much convenience and the file is too big already.
2014-07-04 16:31:19 -04:00
Andrew Grieve
965e4e9b19
Fix CordovaPreferences not correctly parsing hex values (valueOf->decode)
2014-07-04 16:27:16 -04:00
Andrew Grieve
af77977fda
Refactor: Move url-filter information into PluginEntry.
2014-07-04 14:53:00 -04:00
Andrew Grieve
e74baf188f
Don't re-parse config.xml in onResume.
...
There shouldn't be any need to.
2014-07-04 12:19:28 -04:00
Andrew Grieve
663a71255f
Move handling of Fullscreen preference to CordovaActivity
...
Makes more sense here since that's where the other FullScreen related
changes are.
2014-07-04 12:11:19 -04:00
Andrew Grieve
bdf2f22f81
Merge branch 'master' into 4.0.x (ConfigXmlParser breakout)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/PluginManager.java
2014-07-04 11:48:49 -04:00
Andrew Grieve
79aa3e159d
Delete dead code from CordovaActivity
2014-07-04 11:46:03 -04:00
Andrew Grieve
95118398dd
Update .classpath to make Eclipse happy (just re-orders one line)
2014-07-04 11:38:31 -04:00
Andrew Grieve
4d18a8e55f
Delete "CB-3064: The errorUrl is..." Log message left over from debugging presumably
2014-07-04 11:38:16 -04:00
Andrew Grieve
3bab41f138
Refactor Config into ConfigXmlParser, CordovaPreferences
...
Intention here is to be 100% backwards compatible.
2014-07-04 11:31:32 -04:00
Andrew Grieve
a8330773ca
Add missing changes from previous merge commit
2014-07-04 10:32:02 -04:00
Andrew Grieve
4ca2305693
Merge branch 'master' into 4.0.x (Bridge fixes)
...
Conflicts:
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaUriHelper.java
framework/src/org/apache/cordova/CordovaWebView.java
framework/src/org/apache/cordova/CordovaWebViewClient.java
framework/src/org/apache/cordova/ExposedJsApi.java
framework/src/org/apache/cordova/NativeToJsMessageQueue.java
framework/src/org/apache/cordova/PluginManager.java
2014-07-03 23:02:02 -04:00
Andrew Grieve
f577af0886
Delete Location-change JS->Native bridge mode
...
It was always disabled, and there's really no reason to keep it around.
2014-07-03 22:18:18 -04:00
Andrew Grieve
aab47bd453
CB-5988 Allow exec() only from file: or start-up URL's domain
...
Uses prompt() to validate the origin of the calling JS.
This change also simplifies the start-up logic by explicitly disabling
the bridge during page transitions and explictly enabling it when the
JS asks for the bridgeSecret.
We now wait to fire onNativeReady in JS until the bridge is initialized.
It is therefore safe to delete the queue-clear/new exec race condition
code that was in PluginManager.
2014-07-03 22:06:09 -04:00
Andrew Grieve
445ddd89fb
CB-6761 Fix native->JS bridge ceasing to fire when page changes and online is set to false and the JS loads quickly
2014-07-03 13:27:30 -04:00
Joe Bowser
6f21a96238
Update the errorurl to no longer use intents
2014-06-24 12:57:46 -07:00
Joe Bowser
b0b628ffc2
Refactoring the URI handling on Cordova, removing dead code
2014-06-24 12:30:34 -07:00
Andrew Grieve
428e1bc14d
Remove fields from CordovaWebView interface
...
Fields don't make sense in an interface.
2014-06-24 15:28:53 -04:00
Andrew Grieve
d66bb84924
Delete onReset and resetJsMessageQueue from CordovaWebView interface
...
These are implementation details that do not need to be exposed.
2014-06-24 15:26:43 -04:00
Andrew Grieve
4ce5123a12
Merge branch 'master' into 4.0.x (bindButton changes)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
package.json
2014-06-24 15:22:27 -04:00
Andrew Grieve
4b4a2e9f9e
CB-7018 Clean up and deprecation of some button-related functions
2014-06-24 15:08:47 -04:00
Andrew Grieve
58afd0b604
CB-7017 Fix onload=true being set on all subsequent plugins
2014-06-24 14:55:34 -04:00
Andrew Grieve
96a1192474
Merge branch 'master' into 4.0.x (back button default behaviour fix)
...
Conflicts:
framework/src/org/apache/cordova/CordovaChromeClient.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-06-23 14:50:01 -04:00
Andrew Grieve
297f862ccc
Delete explicit activity.finish() in back button handling. No change in behaviour.
...
The default handling calls through to Activity.onBackPressed(), which
by default results in activity.finish(), but can be customized by the
app.
2014-06-23 14:18:54 -04:00
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
Joe Bowser
fd02e5a07e
Update JS snapshot to version 2.10.0-dev (via coho)
2013-11-01 11:11:13 -07:00
Joe Bowser
937056fcaf
Set VERSION to 2.10.0-dev (via coho)
2013-11-01 11:11:09 -07:00
Andrew Grieve
6e4ef508e8
CB-5193 Fix Android WebSQL sometime throwing SECURITY_ERR.
...
Turns out our Quota logic has been wrong all along. If we were to
actually track the quota needed, we'd need to store a map of
dbName->quota for all dbNames. Instead, we just set a really high quota
since we don't ever want to decline storage.
I *think* this fixes all of the SECURITY_ERR exceptions we've been
seeing. Even those on Honeycomb / ICS.
2013-10-24 11:08:02 -04:00
Andrew Grieve
4437d7f3c4
CB-5191 Deprecate <url-filter>
2013-10-23 22:02:49 -04:00
Andrew Grieve
638fbfabdc
Remove cordova.xml fallback from Config.java (it was removed from PluginManager for 3.0)
2013-10-15 12:17:31 -04:00
Andrew Grieve
16de12a3ba
CB-5080 Find resources in a way that works with aapt's --rename-manifest-package
2013-10-15 12:17:14 -04:00
Andrew Grieve
1316578ba3
Update JS snapshot to version 3.2.0-dev (via coho)
2013-10-02 12:40:53 -04:00
Andrew Grieve
b7ede8f9ba
Add missing copyright header for Whitelist.java.
2013-09-17 14:20:57 -04:00
Andrew Grieve
95edd970bc
Update JS snapshot to version 3.2.0-dev (via coho)
2013-09-17 11:03:52 -04:00
Andrew Grieve
2c6285d4b3
Set VERSION to 3.2.0-dev (via coho)
2013-09-17 11:03:51 -04:00
Joe Bowser
39d32bcb5b
CB-4620: Throwing this over the fence, since there is a problem actually in the wild here
2013-09-11 15:02:00 -07:00
Andrew Grieve
3351fdbc74
Restore deleted classes (FileHelper, etc) and deprecate them instead.
...
The classes are:
[CB-4766] JSONUtils.java
[CB-4765] ExifHelper.java
[CB-4764] DirectoryManager.java
[CB-4763] FileHelper.java
2013-09-11 11:13:57 -04:00
Andrew Grieve
2b0aa03380
[CB-4766] Delete JSONUtils.java
2013-09-09 16:47:55 -04:00
Andrew Grieve
fc7261b199
[CB-4765] Move ExifHelper.java out of core (and into camera plugin)
2013-09-09 16:17:53 -04:00
Andrew Grieve
3200c50b9f
[CB-4764] Delete DirectoryManager.java
2013-09-09 16:11:41 -04:00
Andrew Grieve
862a8eab8d
[CB-4763] Delete FileHelper.java, Move getMimeType() into CordovaResourceApi.
2013-09-09 15:43:04 -04:00
Andrew Grieve
80a09b8f36
[CB-4725] Add CordovaWebView.CORDOVA_VERSION constant
...
This used to be available as Device.cordovaVersion, but was broken in 3.0.
2013-09-09 11:22:18 -04:00
Joe Bowser
5f7ce4b868
Reverting CB-3949: Squeay wheel gets the grease
2013-08-28 14:42:23 -07:00
Ian Clelland
e6812f18a0
Allow CordovaChromeClient subclasses access to CordovaInterface and CordovaWebView members
2013-08-23 14:37:36 -04:00
Ian Clelland
f604988181
Refactor CordovaActivity.init so that subclasses can easily override factory methods for webview objects
2013-08-23 13:04:19 -04:00
Joe Bowser
f42b34d6b4
CB-4318: We have docs, this doesn't need to be in the comments
2013-08-20 16:29:31 -07:00
Andrew Grieve
166b35bc6c
Tweak the online bridge to not send excess online events.
...
It does so by having the JS tell it when online events have fired.
2013-08-15 15:55:08 -04:00
Andrew Grieve
5451320350
Log WebView IOExceptions only when they are not 404s
2013-08-15 11:33:38 -04:00
Andrew Grieve
fe45b29ef6
Use a higher threshold for slow exec() warnings when debugger is attached.
2013-08-13 15:08:54 -04:00
Andrew Grieve
4e1aa8aa59
Fix data URI decoding in CordovaResourceApi
...
It was not URI-decoding first, and so was broken for non-base64-encoded
URIs.
2013-08-13 14:11:40 -04:00
Joe Bowser
2bdc849c2b
CB-3819: Implemented Feature
2013-07-30 15:03:25 -07:00
Max Woghiren
7cbe8f5843
[CB-4013] Fixed loadUrlTimeoutValue preference.
2013-07-30 12:21:50 -04:00
Sharif Ahmed
810df61049
[CB-4410] Fixed @param mismatching
2013-07-30 11:21:02 -04:00
Joe Bowser
5c38101a9e
Upgrading project to Android 4.3
2013-07-29 11:30:41 -07:00
Ian Clelland
463c7b5027
[CB-4096] Implemente new unified whitelist for android
2013-07-23 11:23:14 -04:00
David Kemp
7c7230dd35
[CB-4280] handle invalid bridge mode request
2013-07-22 18:15:09 -04:00
Andrew Grieve
b915aafb5b
[CB-3384] Fix thread assertion when plugins remap URIs
2013-07-18 01:38:47 -04:00
David Kemp
8202ab83fa
[CB-4133] Add main thread warning for plugins that run too long
2013-07-16 21:19:11 -04:00
Joe Bowser
2fe6d14e56
We can remove the plugins tag now. Tested plugman, it's all good.
2013-07-16 15:00:28 -07:00
Ian Clelland
7ee285342f
Update cordova.js to latest (3.0.0-rc1) version
2013-07-16 14:48:48 -04:00
Andrew Grieve
6fe18ae0ab
[CB-3384] Use the ExposedJsApi to detect webCore thread instead of IceCreamCordovaWebViewClient.
...
Also removes a debug log statement.
2013-07-16 09:39:47 -04:00
denis
a9ebf50b86
Prevent NPE in case webview is lately initialized
2013-07-15 13:34:55 -07:00
Andrew Grieve
8d8cbf6e28
Set minSdkVersion to 8 for DroidGap project
2013-07-15 15:22:51 -04:00
Andrew Grieve
77e9092108
[CB-3384] Reworked UriResolver into CordovaResourceApi.
...
Changes were made after trying to use the API for Camera, FileTransfer, Media.
The main difference is separating the concept of URI remapping from the read/write helpers.
2013-07-15 15:18:39 -04:00
Ian Clelland
546948cb8c
[CB-4154] Set default Android target to android-17
...
This is done in the default project.properties file, as well as the create
script for new projects.
2013-07-11 22:26:15 -04:00
Joe Bowser
5cf95cfa01
CB-4156: Adding back the App plugin, since this is required
2013-07-11 14:00:50 -07:00
Ian Clelland
3ae28b3085
[CB-4151] Extract whitelist from Config class for testability
2013-07-11 14:11:37 -04:00
Joe Bowser
b5df9dd88e
CB-3724: Removing the file exceptions
2013-07-11 10:21:40 -07:00
Max Woghiren
b6a01a203a
[CB-4103] Made config parameters case-insensitive.
...
For consistency with other platforms (and for readability), UpperCamelCasing is used by default in the code.
2013-07-10 17:27:13 -04:00
Andrew Grieve
990d91360d
[CB-3384] Add a length getter for UriResolver. Change from interface -> abstract class.
...
Thinking here is that we can maintain compatibility going forward with a
base class as opposed to interface by having new methods on it have
default implementations.
2013-07-10 15:13:03 -04:00
Andrew Grieve
b5c3ac605a
[CB-4038] - Remove o.a.c.api namespace
2013-07-10 09:44:54 -04:00
denis
55865a4f1d
Let subclasses override focus behavior
...
Signed-off-by: Joe Bowser <bowserj@apache.org>
2013-07-09 15:45:41 -07:00
Joe Bowser
ff27ad332b
CB-3172: Killing the deprecation notice in Android, waiting for plugman fixes before removing the empty tags
2013-07-09 15:13:15 -07:00
Joe Bowser
85bad87c1c
CB-4139: Seriously, we didn't deprecate this for a year? WTF?
2013-07-09 15:10:42 -07:00
Ian Clelland
f7014f14df
Update cordova.js -- includes new Binary bridge, supporting Android 4.0
2013-07-09 16:45:25 -04:00
Andrew Grieve
99341bce29
[CB-3384] Make UriResolver assert that IO is not on the UI nor WebCore threads.
2013-07-05 11:44:38 -04:00
Andrew Grieve
79829f6209
[CB-4038] Move non-deprecated classes from the api package into the main package.
2013-06-28 21:53:09 -04:00
Andrew Grieve
a97487bcec
[CB-4048] Merge branch '3.0.0' into master
2013-06-28 11:59:54 -04:00
Andrew Grieve
892ffc8ce4
[CB-3384] Rewrite of DataResource into UriResolver + UriResolvers
...
Includes unit tests woot!
Note that this remove CordovaPlugin.shouldInterceptRequest(). Should be
fine since this method was introduced only a couple of releases ago, was
never documented, and afaict was only used by the Chrome Cordova plugins.
2013-06-27 21:55:28 -04:00
Andrew Grieve
3b7e0504e8
Remove accidentally checked in log statement "running exec normally"
...
(cherry picked from commit 68bc57ae85
)
2013-06-26 14:23:50 -04:00
Andrew Grieve
68bc57ae85
Remove accidentally checked in log statement "running exec normally"
2013-06-26 14:22:41 -04:00
Andrew Grieve
f42e5f66fd
Explicitly print exceptions that occur within ExposedJsApi.
...
Before they trickled into JNI and the stack traces were lost.
(cherry picked from commit 10d31ea0a3
)
2013-06-26 14:21:48 -04:00
Andrew Grieve
10d31ea0a3
Explicitly print exceptions that occur within ExposedJsApi.
...
Before they trickled into JNI and the stack traces were lost.
2013-06-26 14:20:45 -04:00
Don Coleman
e64ebdfaee
[CB-3998] video duration is an int
2013-06-25 14:35:23 -04:00
Joe Bowser
7e15ff930d
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
2013-06-24 11:31:47 -07:00
Joe Bowser
b83610a653
CB-3949: Adding code to mitigate broken intents with the application installer
2013-06-24 11:31:32 -07:00
Jeffrey Willms
16e08384c0
[CB-3927] Fix start-up race condition that could cause exec() responses to be dropped.
...
Requires a change to the JS as well.
(cherry picked from commit 9cb14838e8
)
2013-06-21 18:31:57 -04:00
Jeffrey Willms
9cb14838e8
[CB-3927] Fix start-up race condition that could cause exec() responses to be dropped.
...
Requires a change to the JS as well.
2013-06-21 18:30:50 -04:00
Andrew Grieve
f78b444ed1
Remove PluginManager.exec's return value (unused).
...
It's not only not used, but when it was used was messing up the
DISABLE_EXEC_CHAINING flag.
(cherry picked from commit 9946d15f23
)
2013-06-20 22:22:59 -04:00
Andrew Grieve
9946d15f23
Remove PluginManager.exec's return value (unused).
...
It's not only not used, but when it was used was messing up the
DISABLE_EXEC_CHAINING flag.
2013-06-20 22:20:58 -04:00
Joe Bowser
b032dcca16
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
2013-06-20 16:33:17 -07:00
Joe Bowser
01d6ae55a4
CB-3854: Added support for wildcard. This probably could be improved, but it does work
2013-06-20 16:33:14 -07:00
Joe Bowser
f1b377bf07
CB-3854: Added support for wildcard. This probably could be improved, but it does work
2013-06-20 16:32:18 -07:00
Andrew Grieve
03c5208d47
Update JS snapshot to version 2.9.0rc1 (via coho)
2013-06-20 15:21:58 -04:00
Joe Bowser
3ace9348f6
Merge branch 'CB-3932' of git://github.com/angelaf/cordova-android
2013-06-19 16:03:18 -07:00
Angela Fowler
3a14017729
CB-3932 Remove baseUrl comment in handleDestroy method made redundant by CB-3766
2013-06-19 15:22:42 +10:00
Steven Gill
e726c0d60b
updated cordova.js
2013-06-18 17:01:56 -07:00
Joe Bowser
98b971b4de
CB-3902: Explicitly add market URIs to CordovaWebViewClient so this always works, not just sometimes
2013-06-18 16:20:14 -07:00
Tim Kim
c531d97ed2
Need to remove reference to device plugin in template
2013-06-18 14:26:11 -07:00
Joe Bowser
8c9e416175
CB-3784: Patches are always welcome
2013-06-18 13:14:30 -07:00
Andrew Grieve
431f3337d9
Update JS snapshot to version 2.9.0rc1
2013-06-18 13:49:19 -04:00
Fil Maj
63ab701685
updated js from latest cordova-js 3.0
2013-06-17 16:53:04 -07:00
Joe Bowser
54d32ad910
CB-3784: Nit-picking
2013-06-17 15:45:56 -07:00
Steven Gill
c8140bad19
removed device.java
2013-06-17 15:27:02 -07:00
Fil Maj
2e5b6bce55
updated cordova.js to remove dependency on network status plugin.
2013-06-17 12:08:10 -07:00
Joe Bowser
c0a39570c9
CB-2391: False positive, this affects 4.2.2, not ICS. Bug breaks before we get to this point. :(
2013-06-14 17:03:40 -07:00
Joe Bowser
9ac4b570e6
CB-2391: Fix for colons crashing the WebView on ICS, tested on Samsung Galaxy S2
2013-06-14 16:55:47 -07:00
Joe Bowser
d2a7d18067
Fixed bad comment, it's all dying at the same time
2013-06-14 15:30:24 -07:00
Joe Bowser
90f83db9c9
CB-3504: Fixing issue with the use of WebResourceResponse on pre-Honeycomb devices.
2013-06-14 15:29:30 -07:00
hermwong
d845736948
removed file system access permission
2013-06-13 16:59:54 -07:00
hermwong
dd837f7130
removed vibration permission
2013-06-13 16:31:27 -07:00
Steven Gill
12ebadbb0f
Merge branch '3.0.0' of https://git-wip-us.apache.org/repos/asf/cordova-android into 3.0.0
2013-06-13 15:56:00 -07:00
Steven Gill
e30bc6b6e4
updated cordovajs
2013-06-13 15:55:48 -07:00
Tim Kim
9288158226
Made some functions in DirectoryManager public
2013-06-13 15:24:01 -07:00
Steven Gill
3a55991480
updated js
2013-06-13 14:54:30 -07:00
Steven Gill
9e44596db7
updated directory manager
2013-06-13 14:39:08 -07:00
Ian Clelland
5cff144a22
[CB-2406] Add support for binary data in FileWriter.write()
2013-06-12 13:33:03 -04:00
Joe Bowser
a021adb7fd
CB-3766: Javascript uses loadUrl, not loadUrlIntoView, which is only for documents
2013-06-12 09:33:52 -07:00
Joe Bowser
a70c8536f9
Re-adding the Plugin.java shim for now. This will remain a 2.x-only feature
2013-06-11 10:38:42 -07:00
Steven Gill
9aaa152b9a
updated from master
2013-06-10 17:15:05 -07:00
hermwong
a2b8ebf57e
Merge branch '3.0.0' of https://git-wip-us.apache.org/repos/asf/cordova-android into 3.0.0
2013-06-10 16:21:32 -07:00
hermwong
b3fe47985a
removed android.permission.ACCESS_COARSE_LOCATION and android.permission.ACCESS_FINE_LOCATION from AndroidManifest.xml for PBR
2013-06-10 16:14:56 -07:00
Joe Bowser
e52d4fc003
CB-3736: Cleaning up code so that this makes more sense. Variables are OK
2013-06-07 16:43:53 -07:00
Joe Bowser
3753e3f353
Trying to get DataResource reverted so that we don't have to worry about this blowing up while we're breaking things out. DataResource should be on a branch until it's ready!
2013-06-06 14:35:12 -07:00
Andrew Grieve
979d8e66f2
Revert "Added "DataResource" - allows many plugins to intercept a single request"
...
This reverts commit 62c3e46529
.
Reverting all DataResource changes for the 2.8.0 release.
Conflicts:
framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
framework/src/org/apache/cordova/api/DataResource.java
framework/src/org/apache/cordova/api/DataResourceContext.java
2013-06-06 14:14:14 -07:00
Andrew Grieve
c5b37cc7e7
Revert "Changed all usages of FileHelper to use the new DataResource mechanism."
...
This reverts commit 867358ea81
.
Reverting all DataResource changes for the 2.8.0 release.
Conflicts:
framework/src/org/apache/cordova/FileUtils.java
2013-06-06 14:12:44 -07:00
Andrew Grieve
e3989bcc2b
Revert "DataRequest code cleaned up."
...
This reverts commit a001d8cfb7
.
Reverting all DataResource changes for the 2.8.0 release.
Conflicts:
framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
2013-06-06 14:10:13 -07:00
Andrew Grieve
2f9c512b59
Revert "DataResource bugfix WebviewClient logs error for http urls."
...
This reverts commit 8f91ebf194
.
Reverting all DataResource changes for the 2.8.0 release.
Conflicts:
framework/src/org/apache/cordova/FileHelper.java
framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
2013-06-06 14:08:52 -07:00
Andrew Grieve
43172cf530
Revert "CB-3496: Fixed streaming audio, this is pretty important for mobile spec"
...
This reverts commit aa81966e0b
.
Going to revert all DataResource changes for on the 2.8.x branch.
2013-06-06 14:06:54 -07:00
David Kemp
c3b8b279b0
CB-3420: add hidden option to InAppBrowser
2013-06-05 10:19:56 -04:00
Joe Bowser
12d06bd727
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
2013-06-03 14:45:49 -07:00
Joe Bowser
bc52345f05
CB-3548: Throwing this one over the fence, but this change appears sane. We should just return false.
2013-06-03 14:45:27 -07:00
Ian Clelland
c28a313374
[CB-3569] Allow FileTransfer.upload to reference android_assets
2013-06-03 16:14:22 -04:00
Ian Clelland
c509c8e7e5
[CB-3563] Update references to DroidGap in code comments
2013-05-31 11:20:33 -04:00
Ian Clelland
fb89cef256
[CB-3563] Replace instances of DroidGap in log messages with more appropriate symbols
2013-05-31 11:16:09 -04:00
Ian Clelland
9ac9fd4fe9
[CB-3563] Change default logging tag from DroidGap to CordovaActivity
2013-05-31 10:54:40 -04:00
Ian Clelland
dfb89df4f1
[CB-3561] Update documentation comments to match implementation
...
Affects CordovaInterface and CordovaActivity. There should probably be a
concerted effort to update this across the entire project.
2013-05-31 10:54:40 -04:00
Andrew Grieve
420cee4ee6
[CB-3468] Add missing license headers found by RAT
2013-05-28 16:43:38 -04:00
Ian Clelland
403297d967
CB-3523: Fix NPE on app restart with outstanding callback
2013-05-28 15:11:25 -04:00
Ian Clelland
abba254a38
CB-3358: Remove one more reference to commons-codec
2013-05-28 15:09:21 -04:00
Shravan Narayan
048107e378
CB-3384 Bugfix - Non null Mimetype is not required for WebResourceResponse
2013-05-28 13:58:39 -04:00
David Kemp
78efe2a960
CB-3358: Change Commons-codec:base64 to Android:Base64
2013-05-27 22:25:23 -04:00
Andrew Grieve
8077091b34
Update JS snapshot to version 2.8.0rc1
2013-05-27 22:15:49 -04:00
Joe Bowser
1c9d76e637
CB-3496: Fixed streaming audio, this is pretty important for mobile spec
2013-05-24 11:29:28 -07:00
Steven Gill
98d9901693
removed contacts from js
2013-05-23 15:18:39 -07:00
Steven Gill
75f358d01e
removed contact code from js
2013-05-22 17:12:13 -07:00
Ian Clelland
01946dd4d6
[CB-3430] [CB-1413] Remove Old (2.3.3) HTTP Workaround
2013-05-22 13:57:16 -04:00
Joe Bowser
77eada7dbd
CB-3064: We need to re-create the config object on resume, always create an object on init.
2013-05-21 13:33:09 -07:00
Steven Gill
f7c97cb1d0
removed splashscreen code from cordova.js
2013-05-21 13:04:40 -07:00
Steven Gill
7c22bc74bc
removed batter code from js
2013-05-20 17:40:11 -07:00
Steven Gill
dfd668d145
removed inappbrowser from cordovajs
2013-05-20 15:01:50 -07:00
Steven Gill
dbc6dd73f3
removed CordovaLocationListner
2013-05-17 15:38:08 -07:00
Steven Gill
4765c6fcc5
updated cordovajs, removed geolocation code
2013-05-17 15:19:04 -07:00
Steven Gill
78dd084303
updated cordova.js to include proper plugin loading
2013-05-17 10:51:52 -07:00
Steven Gill
cd9fb9b709
updated cordovajs
2013-05-16 18:01:24 -07:00
Steven Gill
adcbd879c8
ripped out plugins
2013-05-16 17:53:11 -07:00
Fil Maj
227733d195
[CB-3416] adding empty <plugins> element during deprecation window.
2013-05-16 14:35:58 -07:00
Shravan Narayan
13148728b3
Bugfix: Config parser for plugins with onload param.
...
The functionality was broken in the move from plugins to feature tags.
2013-05-16 15:41:59 -04:00
Shravan Narayan
8f91ebf194
DataResource bugfix WebviewClient logs error for http urls.
2013-05-16 14:29:04 -04:00
Simon MacDonald
cb07fe395c
CB-3068: Android menu not appearing as actionoverflow
2013-05-13 22:22:59 -04:00
Shravan Narayan
a001d8cfb7
DataRequest code cleaned up.
2013-05-08 17:38:58 -04:00
Shravan Narayan
867358ea81
Changed all usages of FileHelper to use the new DataResource mechanism.
2013-05-08 17:38:58 -04:00
Shravan Narayan
62c3e46529
Added "DataResource" - allows many plugins to intercept a single request
2013-05-08 17:38:58 -04:00
Andrew Grieve
8a95ed8ee6
[CB-3307] Rename cordova-VERSION.js -> cordova.js
2013-05-08 09:52:56 -04:00
Joe Bowser
20caac1b6e
CB-3357: Fixing resource grabbing
2013-05-07 13:30:30 -07:00
Joe Bowser
48b8c69ba0
Part 2 of 2: CB-2657 Creating the dummy class so we have backwards compatibility
2013-05-07 09:46:26 -07:00
Joe Bowser
35d53a0684
Part 1 of 2: CB-2657 Moving DroidGap in git so we don't lose random commits. This is irritating
2013-05-07 09:45:50 -07:00
Joe Bowser
dbeb252fee
CB-3337: Not sure why the splashscreen was changed, fixing 9-patch
2013-05-03 15:37:48 -07:00
mbillau
21614ea891
Fix spacing, convert all tabs to spaces
2013-05-03 13:21:01 -04:00
mbillau
4b38ccef80
CB-3022: Add default text to Android Prompt
2013-05-03 13:18:30 -04:00
Abel Muiño
2d4d18fd75
[CB-3040] length is 1-based, but index is 0-based, can't use == in comparison
2013-05-03 13:13:48 -04:00
Andrew Grieve
27cd9dde38
[CB-1108] Update config.xml template's list of available <preference>s
2013-05-03 12:18:36 -04:00
Andrew Grieve
373da39ac2
[CB-1108] Make onload=true settable as a <feature> <param>
...
Plus some simplification of code.
2013-05-03 12:18:21 -04:00
Andrew Grieve
b7990b7df8
Deprecate <log> in favour of <preference name="loglevel">
2013-05-03 12:11:09 -04:00
Gorkem Ercan
4b9047b7d8
[CB-1108] Convert config.xml from <plugin> to <feature>
...
This unifies the config.xml used by iOS and Android. Now <feature> tags can be used
to add plugins. The changes are non-intrusive so the older versions of the config.xml
can still be used after this change. The value of a param named "android-package"
determines the class for the plugin.
2013-05-03 11:35:00 -04:00
Ian Clelland
cbb0bd5ee7
[CB-2431] Update to okhttp to include jwilson's recovery fixes [f38fec5b]
2013-04-29 09:37:53 -04:00
Ian Clelland
553a25cea7
[CB-2431] Switch to OkHttp for FileTransfer connections
2013-04-29 09:31:23 -04:00
Shravan Narayan
53982272d6
[CB-3226] Fix: plugins can intercept urls with "?", "#", "%20"
2013-04-24 18:59:24 -04:00
Joe Bowser
a32cf2344f
CB-2810: Add Source and Line Number to logging, I wish we could tell the Web Console to shut up if it doesn't match our console
2013-04-23 14:56:14 -07:00
Joe Bowser
934cf32163
CB-3064: One line fix for the error where the config wasn't being read. Will have to add doc step for CordovaWebView
2013-04-23 13:53:10 -07:00
Joe Bowser
a17c7b9bbf
Fixing CB-2685: This class does nothing. Cordova is a Library not an Application
2013-04-22 16:57:54 -07:00
Joe Bowser
025676d6e7
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
2013-04-18 14:52:17 -07:00
Joe Bowser
aad396ae38
CB-3165: Deprecation Notice
2013-04-18 14:44:00 -07:00
Andrew Grieve
c798d131bb
Update JS snapshot for 2.7.0
2013-04-18 15:28:00 -04:00
Ian Clelland
bf3e024648
[CB-3066] Fire onNativeReady from JS, as bridge is available immediately
2013-04-18 14:20:32 -04:00
Andrew Grieve
191f31baa7
[CB-2432] Don't try and write exif info for images from picasa
2013-04-17 16:40:00 -04:00
Joe Bowser
d3b7903af8
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
2013-04-17 13:37:48 -07:00
Andrew Grieve
b13166f5d9
[CB-2432] Fix Camera.getPicture() for picasa images
2013-04-17 16:12:28 -04:00
Andrew Grieve
80fe4458c6
Use FileHelper in IceCreamCordovaWebViewClient.
...
Removes some duplicate logic and makes it a bit more robust.
2013-04-17 15:51:37 -04:00
Andrew Grieve
791574c26e
Make URL parsing more robust in FileHelper.
...
Fixes some cases when query parameters mess things up.
2013-04-17 15:50:29 -04:00
Joe Bowser
ac61ebf2d5
Merge branch 'master' of github.com:SunshineTech/cordova-android into sunshine
2013-04-17 11:44:49 -07:00
avidmich
cb99ed0a01
Fixing URL transformation algorithm
...
It didn't work with URL like this:
http://host.com/path/to/file.txt#/foo?bar=baz
When hash sign is in front of question mark - it only strips the question mark, leaving the hash and breaking the whole app.
2013-04-16 15:45:32 -04:00
Andrew Grieve
4864d52966
[CB-2202] Remove Plugin.java (was deprecated).
2013-04-16 15:29:16 -04:00
Andrew Grieve
b2d61679fb
[CB-2963] Re-enable sending messages in batches.
...
Disabled by CB-1745, which is now reverted.
2013-04-16 15:04:56 -04:00
Joe Bowser
c65c259123
CB-2200: Remove deprecated Android device.name
2013-04-11 13:53:12 -07:00
Joe Bowser
e7e2730929
Fixing CB-2955, breaking CB-2085, use localStorage, NOT WebSQL
2013-04-08 15:53:14 -07:00
Joe Bowser
bb9615eed0
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
2013-04-04 16:06:03 -07:00
Joe Bowser
18877bf80e
Adding additional condition that the phone must be made by HTC for the setNavDump to be set to true to try and work around CB-2907, if it's still a problem on HTC devices running Android 2.2, that's just the luck of the draw.
2013-04-04 16:05:35 -07:00
HUANG Menghuai
778b784eb6
[CB-2908] Fix the DroidGap activity Lifecycle broken issue
...
Attempting to invoke the Activity's finish() onDestroy breaks an Activity's lifecycle
flag. OnDestroy can be called by the system, for instance, on restarting an Activity,
it's definitely different from a normal finish().
Finish() incorrectly in onDestroy results in another DroidGap derived activity
is started, while the original one is not yet onDestroy. This issue could be
found when the system is trying to restart the activity upon, for instance,
receiving immediately successive device Config changes.
2013-04-04 16:47:03 -04:00
Andrew Grieve
5ff900f7ec
Fixup for CB-2654.
2013-04-04 16:45:39 -04:00
Steren
ba31424604
Keep the splashscreen image ratio instead of streatching it.
...
An ImageView is used to be able to use ScaleType.CENTER_CROP, which is similar to the background-size:cover CSS property
2013-04-04 16:19:12 -04:00
Ian Clelland
1782111d45
[CB-2654] Delay executeScript/insertCSS callback until resources have loaded; pass JS results to callback
2013-04-04 14:34:58 -04:00
Max Woghiren
1fa63300aa
[CB-2666] Added check for null arguments.
...
If null arguments are received, send an error and an explanation.
2013-04-02 11:51:25 -04:00
Joe Bowser
b42c918973
Prep for 2.6.0 final
2013-04-01 14:54:51 -07:00
Joe Bowser
f12262ea96
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-android
2013-03-28 10:02:46 -07:00
Joe Bowser
334cf45d6d
Fixing CB-1700, we had the file names reversed, so exif was never being written right. Needed to upload a file to debug this thing
2013-03-28 10:02:18 -07:00
Joe Bowser
b7bb72294a
CB-1796: Let's make sure we actually write the file instead of just writing EXIF to NOTHING
2013-03-28 10:02:02 -07:00
Joe Bowser
64ff204371
Updating JS
2013-03-28 10:01:15 -07:00
Ian Clelland
282367c6d5
[CB-1517] Properly report download progress for GZIP-encoded resources
2013-03-27 17:00:22 -04:00
JasonM23
5ee7e81ff9
[CB-51] Added httpMethod for upload (defaults to POST)
2013-03-27 14:22:41 -04:00
Shravan Narayan
f4859444dd
Fixed protocol regex bug. Unknown protocol support Added whitelist support for unknown protocols
2013-03-26 00:20:11 -04:00