Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E42E310B7C for ; Fri, 9 Jan 2015 19:31:43 +0000 (UTC) Received: (qmail 98833 invoked by uid 500); 9 Jan 2015 19:31:45 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 98810 invoked by uid 500); 9 Jan 2015 19:31:45 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 98801 invoked by uid 99); 9 Jan 2015 19:31:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jan 2015 19:31:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E8F2B816DAF; Fri, 9 Jan 2015 19:31:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: android commit: CB-8026: Bumping up Android Version and setting it up to allow third-party cookies. This might change later. Date: Fri, 9 Jan 2015 19:31:44 +0000 (UTC) Repository: cordova-android Updated Branches: refs/heads/master c3610aa43 -> 15e19489e CB-8026: Bumping up Android Version and setting it up to allow third-party cookies. This might change later. Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/15e19489 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/15e19489 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/15e19489 Branch: refs/heads/master Commit: 15e19489e3c312718802fb7ea774f11dcf4217b9 Parents: c3610aa Author: Joe Bowser Authored: Fri Jan 9 11:30:13 2015 -0800 Committer: Joe Bowser Committed: Fri Jan 9 11:31:29 2015 -0800 ---------------------------------------------------------------------- framework/project.properties | 2 +- framework/src/org/apache/cordova/CordovaWebView.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/15e19489/framework/project.properties ---------------------------------------------------------------------- diff --git a/framework/project.properties b/framework/project.properties index 9fe04f3..57bcb9a 100644 --- a/framework/project.properties +++ b/framework/project.properties @@ -10,7 +10,7 @@ # Indicates whether an apk should be generated for each density. split.density=false # Project target. -target=android-19 +target=android-21 apk-configurations= renderscript.opt.level=O0 android.library=true http://git-wip-us.apache.org/repos/asf/cordova-android/blob/15e19489/framework/src/org/apache/cordova/CordovaWebView.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index 9fc480c..5323d08 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -50,6 +50,7 @@ import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebSettings.LayoutAlgorithm; import android.webkit.WebViewClient; +import android.webkit.CookieManager; import android.widget.FrameLayout; /* @@ -191,7 +192,14 @@ public class CordovaWebView extends WebView { settings.setJavaScriptEnabled(true); settings.setJavaScriptCanOpenWindowsAutomatically(true); settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL); - + + // Enable third-party cookies if on Lolipop. TODO: Make this configurable + if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) + { + CookieManager cookieManager = CookieManager.getInstance(); + cookieManager.setAcceptThirdPartyCookies(this, true); + } + // Set the nav dump for HTC 2.x devices (disabling for ICS, deprecated entirely for Jellybean 4.2) try { Method gingerbread_getMethod = WebSettings.class.getMethod("setNavDump", new Class[] { boolean.class }); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org