diff --git a/resources/static/common/js/network.js b/resources/static/common/js/network.js index e68780d920d925e08818777139536f32f629b6de..190b3396df94d5d4be4e61abeff2789576075b88 100644 --- a/resources/static/common/js/network.js +++ b/resources/static/common/js/network.js @@ -714,14 +714,19 @@ BrowserID.Network = (function() { withContext(function() { var enabled; try { - // set a test cookie with a duration of 1 second. // NOTE - The Android 3.3 and 4.0 default browsers will still pass // this check. This causes the Android browsers to only display the // cookies diabled error screen only after the user has entered and // submitted input. - // http://stackoverflow.com/questions/8509387/android-browser-not-respecting-cookies-disabled/9264996#9264996 - document.cookie = "test=true; max-age=1"; - enabled = document.cookie.indexOf("test") > -1; + // http://stackoverflow.com/questions/8509387/android-browser-not-respecting-cookies-disabled + + document.cookie = "__cookiesEnabledCheck=1"; + enabled = document.cookie.indexOf("__cookiesEnabledCheck") > -1; + + // expire the cookie NOW by setting its expires date to yesterday. + var expires = new Date(); + expires.setDate(expires.getDate() - 1); + document.cookie = "__cookiesEnabledCheck=; expires=" + expires.toGMTString(); } catch(e) { enabled = false; }