mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show appropiate message and update library reference

Browse source
This commit is contained in:
jabarros 2014-08-04 10:21:48 +02:00
parent a05b9a85a1
commit fcb556eb2d
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
owncloud-android-library

@ -1 +1 @@
Subproject commit 6b155fb8029973af08751cf42a77b4a4afd0536d
Subproject commit fe6f99ea6a7334f565caa4d6ee5a29d1436b4c4f

2
res/values/strings.xml
View file

@ -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 has been redirect to a non secure one.</string>
</resources>

17
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

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