dbb196a17e
Delete url-filters logic (in 4.0.x branch only)
2014-07-08 11:58:56 -04:00
05a95c699f
Merge branch 'master' into 4.0.x (Fix setPluginEntries)
2014-07-08 11:55:04 -04:00
9ea8b2237a
Fix PluginManager.setPluginEntries not removing old entries
2014-07-08 11:54:38 -04:00
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
e86c2e5970
Move registration of App plugin from config.xml -> code
...
Less fragile this way.
2014-07-08 11:47:26 -04:00
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
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
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
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
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
965e4e9b19
Fix CordovaPreferences not correctly parsing hex values (valueOf->decode)
2014-07-04 16:27:16 -04:00
af77977fda
Refactor: Move url-filter information into PluginEntry.
2014-07-04 14:53:00 -04:00
e74baf188f
Don't re-parse config.xml in onResume.
...
There shouldn't be any need to.
2014-07-04 12:19:28 -04:00
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
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
79aa3e159d
Delete dead code from CordovaActivity
2014-07-04 11:46:03 -04:00
95118398dd
Update .classpath to make Eclipse happy (just re-orders one line)
2014-07-04 11:38:31 -04:00
4d18a8e55f
Delete "CB-3064: The errorUrl is..." Log message left over from debugging presumably
2014-07-04 11:38:16 -04:00
3bab41f138
Refactor Config into ConfigXmlParser, CordovaPreferences
...
Intention here is to be 100% backwards compatible.
2014-07-04 11:31:32 -04:00
a8330773ca
Add missing changes from previous merge commit
2014-07-04 10:32:02 -04:00
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
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
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
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
6f21a96238
Update the errorurl to no longer use intents
2014-06-24 12:57:46 -07:00
b0b628ffc2
Refactoring the URI handling on Cordova, removing dead code
2014-06-24 12:30:34 -07:00
428e1bc14d
Remove fields from CordovaWebView interface
...
Fields don't make sense in an interface.
2014-06-24 15:28:53 -04:00
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
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
4b4a2e9f9e
CB-7018 Clean up and deprecation of some button-related functions
2014-06-24 15:08:47 -04:00
58afd0b604
CB-7017 Fix onload=true being set on all subsequent plugins
2014-06-24 14:55:34 -04:00
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
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
c052f40ef8
Remove onKey* from CordovaWebView interface (these exist on View already)
2014-06-20 16:09:14 -04:00
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
8ac067da89
Rethinking the URI helper
2014-06-19 13:20:44 -07:00
3a9898a6a6
CB-6971 Fix infinite recursion for onReceiveError
2014-06-18 13:20:47 -04:00
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
3b27cd093b
CB-6873: Removing from cordova-android, still in the camera plugin
2014-06-17 11:22:42 -07:00
483babe3bc
Add documentation referencing other implementation.
2014-06-09 15:50:20 -04:00
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
b407641049
CB-6851 Deprecate WebView.sendJavascript()
2014-06-08 22:47:41 -04:00
d5e8807756
Set version to 4.0.0-dev
2014-06-06 15:00:41 -04:00
eb623a84d5
Trivial spelling fix in comments when reading CordovaResourceApi
2014-06-04 11:13:37 -07:00
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
b42faea2eb
Merge branch 'pluggable_webview' into 4.0.x
2014-05-29 11:20:35 -04:00
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
404d3e0959
CB-6315: Wrapping this so it runs on the UI thread
2014-05-23 11:31:13 -07:00
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
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
Andrew Grieve