Joe Bowser
a7ccb9243d
Merging latest master, including new tests
2014-08-14 14:20:49 -07: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
