|
@@ -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;
|