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