Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_...
authormasensio <masensio@solidgear.es>
Fri, 7 Mar 2014 14:11:59 +0000 (15:11 +0100)
committermasensio <masensio@solidgear.es>
Fri, 7 Mar 2014 14:11:59 +0000 (15:11 +0100)
commit9cac3b60a574f2b82cb3b33b45d3a4ba9a2f4d3e
treefd5a4ce6a5ab6e81ac046a1975877bf1cdf05ec5
parent69445038745b47f72693befc67cca72c305786d6
parente3be24b472a4f34168ed8360da376310f7e24a67
Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview
res/layout/ssl_untrusted_cert_layout.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/authentication/SsoWebViewClient.java
src/com/owncloud/android/ui/dialog/SslUntrustedCertDialog.java
src/com/owncloud/android/ui/dialog/SslUntrustedCertDialogForEmptySslError.java