Andrew Grieve
b1bdf23d9c
Switch default build type to gradle (4.0.x only)
2014-12-03 10:12:31 -05:00
Andrew Grieve
12bf07d560
Merge branch 'master' into 4.0.x (volume stream & setMediaPlaybackRequiresUserGesture)
...
Conflicts:
framework/src/org/apache/cordova/CordovaActivity.java
framework/src/org/apache/cordova/CordovaWebView.java
2014-12-03 10:09:05 -05:00
Andrew Grieve
132650df28
CB-8112 Turn off mediaPlaybackRequiresUserGesture
2014-12-03 10:04:54 -05:00
Andrew Grieve
81a77949fc
CB-6153 Add a preference for controlling hardware button audio stream (DefaultVolumeStream)
...
This, along with the commit to the audio plugin, makes it so that by
default apps control the ringer volume, but when any audio players are
active, the media volume is controlled.
2014-11-27 10:52:19 -05:00
Andrew Grieve
e597f98c62
Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)
2014-11-26 11:48:08 -05:00
Andrew Grieve
7fbb2b195f
CB-8081 Allow gradle builds to use Java 6 instead of requiring 7
2014-11-26 11:44:49 -05:00
Andrew Grieve
1feaa7fed7
CB-8031 Fix race condition that shows as ConcurrentModificationException
2014-11-17 22:11:21 -08:00
Andrew Grieve
4859f8f759
Merge branch 'master' into 4.0.x (receiver context)
2014-11-06 16:23:49 -05:00
Andrew Grieve
ac284fd39c
CB-7976 Use webView's context rather than Activity's context for intent receiver
2014-11-06 16:23:32 -05:00
Andrew Grieve
fdef0db87c
Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI)
...
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
2014-11-06 15:37:30 -05:00
Andrew Grieve
e78db000c6
CB-7974 Cancel timeout timer if view is destroyed
2014-11-06 15:33:10 -05:00
Andrew Grieve
032ea8a8d3
CB-7940 Disable exec bridge if bridgeSecret is wrong
2014-11-04 15:57:51 -05:00
Ian Clelland
fc63f66e89
CB-7758: Allow content-url-hosted pages to access the bridge
...
This allows e.g. jsHybugger to create pages with access to Cordova APIs.
We restrict access to content provider URLs which are at subdomains of the application itself, ie, begin with "content://com.your.package.id."
2014-10-27 15:26:38 -04:00
Andrew Grieve
cc7d352209
Merge branch 'master' into 4.0.x (gradle signing+SecureRandom)
2014-10-21 13:00:07 -04:00
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
