From: jabarros <jabarros@solidgear.es>
Date: Thu, 7 Aug 2014 14:04:10 +0000 (+0200)
Subject: Merge pull request #582 from owncloud/unsecured_server_connection
X-Git-Tag: oc-android-1.7.0_signed~229
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b6a5c74d2db8991d46cbd4d1e63bb49ac19ffd41?hp=135150c5a80a2ba0e9311ddfb8e98055e179387d

Merge pull request #582 from owncloud/unsecured_server_connection

Unsecured server connection
---

diff --git a/owncloud-android-library b/owncloud-android-library
index 6b155fb8..e43e43f5 160000
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 6b155fb8029973af08751cf42a77b4a4afd0536d
+Subproject commit e43e43f51a895c591b72aaef8f36ef5595d18dba
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e41e3a1..79b1d2f9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -282,4 +282,6 @@
 	<string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
 	<string name="downloader_download_file_not_found">The file is no longer available on the server</string>
 
+	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through a non secure route.</string>
+
 </resources>
diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index bc0ab54e..07c4d792 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -62,23 +62,19 @@ import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.SsoWebViewClient.SsoWebViewClientListener;
-import com.owncloud.android.lib.common.OwnCloudAccount;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
-import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.accounts.AccountTypeUtils;
 import com.owncloud.android.lib.common.accounts.AccountUtils.Constants;
-import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod;
-import com.owncloud.android.operations.GetServerInfoOperation;
-import com.owncloud.android.operations.OAuth2GetAccessToken;
-
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;
+import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;
-
+import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod;
+import com.owncloud.android.operations.GetServerInfoOperation;
+import com.owncloud.android.operations.OAuth2GetAccessToken;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.services.OperationsService.OperationsServiceBinder;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
@@ -86,7 +82,6 @@ import com.owncloud.android.ui.dialog.SamlWebViewDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
 import com.owncloud.android.utils.Log_OC;
-import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 
 /**
  * This Activity is used to add an ownCloud account to the App
@@ -1167,6 +1162,10 @@ SsoWebViewClientListener, OnSslUntrustedCertListener {
         case UNKNOWN_ERROR:
             mServerStatusText = R.string.auth_unknown_error_title;
             break;
+        case OK_REDIRECT_TO_NON_SECURE_CONNECTION:
+            mServerStatusIcon = android.R.drawable.ic_partial_secure;
+            mServerStatusText = R.string.auth_redirect_non_secure_connection_title;
+            break;
         default:
             mServerStatusText = 0;
             mServerStatusIcon = 0;