From 48f13c8adc5c4b9bc4ca96bf13939a7d7cfae562 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 5 Sep 2012 13:46:30 +0200 Subject: [PATCH] SSL connections update: notice about untrusted certificates and allow the user save them as reliable --- AndroidManifest.xml | 4 +- res/layout/ssl_validator_layout.xml | 116 +++++++++ res/values/strings.xml | 11 + src/com/owncloud/android/Uploader.java | 2 +- .../authenticator/AuthenticationRunnable.java | 9 +- .../authenticator/ConnectionCheckOperation.java | 137 ++++++++++ .../authenticator/ConnectionCheckerRunnable.java | 4 +- .../android/files/services/FileDownloader.java | 3 +- .../android/files/services/FileOperation.java | 2 +- .../android/files/services/FileUploader.java | 3 +- .../files/services/InstantUploadService.java | 2 +- .../android/network/AdvancedSslSocketFactory.java | 168 ++++++++++++ .../android/network/AdvancedX509TrustManager.java | 117 +++++++++ .../EasySSLSocketFactory.java | 3 +- .../EasyX509TrustManager.java | 2 +- .../android/network/OwnCloudClientUtils.java | 283 +++++++++++++++++++++ src/com/owncloud/android/network/SslAnalyzer.java | 82 ++++++ .../operations/OnRemoteOperationListener.java | 7 + .../android/operations/RemoteOperation.java | 135 ++++++++++ .../android/operations/RemoteOperationResult.java | 121 +++++++++ .../syncadapter/AbstractOwnCloudSyncAdapter.java | 2 +- .../android/ui/activity/AuthenticatorActivity.java | 180 ++++++++++++- .../android/ui/activity/FileDisplayActivity.java | 2 +- .../android/ui/dialog/SslValidatorDialog.java | 193 ++++++++++++++ .../android/ui/fragment/FileDetailFragment.java | 2 +- .../android/utils/OwnCloudClientUtils.java | 147 ----------- 26 files changed, 1560 insertions(+), 177 deletions(-) create mode 100644 res/layout/ssl_validator_layout.xml create mode 100644 src/com/owncloud/android/authenticator/ConnectionCheckOperation.java create mode 100644 src/com/owncloud/android/network/AdvancedSslSocketFactory.java create mode 100644 src/com/owncloud/android/network/AdvancedX509TrustManager.java rename src/com/owncloud/android/{authenticator => network}/EasySSLSocketFactory.java (99%) rename src/com/owncloud/android/{authenticator => network}/EasyX509TrustManager.java (98%) create mode 100644 src/com/owncloud/android/network/OwnCloudClientUtils.java create mode 100644 src/com/owncloud/android/network/SslAnalyzer.java create mode 100644 src/com/owncloud/android/operations/OnRemoteOperationListener.java create mode 100644 src/com/owncloud/android/operations/RemoteOperation.java create mode 100644 src/com/owncloud/android/operations/RemoteOperationResult.java create mode 100644 src/com/owncloud/android/ui/dialog/SslValidatorDialog.java delete mode 100644 src/com/owncloud/android/utils/OwnCloudClientUtils.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 151d633a..3d0bc2e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,8 +17,8 @@ along with this program. If not, see . --> + android:versionCode="103009" + android:versionName="1.3.9" xmlns:android="http://schemas.android.com/apk/res/android"> diff --git a/res/layout/ssl_validator_layout.xml b/res/layout/ssl_validator_layout.xml new file mode 100644 index 00000000..9331b290 --- /dev/null +++ b/res/layout/ssl_validator_layout.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + +