From 585054092df5ad4c8fe67bd395d6f17cacf3b3c2 Mon Sep 17 00:00:00 2001 From: jabarros Date: Mon, 4 Aug 2014 14:25:31 +0200 Subject: [PATCH] Fixed bug. It is not possible to connect to a http server --- .../lib/resources/status/GetRemoteStatusOperation.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java index b101aafd..e51f7566 100644 --- a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java +++ b/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java @@ -116,13 +116,12 @@ public class GetRemoteStatusOperation extends RemoteOperation { if (isRedirectToNonSecureConnection) { mLatestResult = new RemoteOperationResult( RemoteOperationResult.ResultCode.OK_REDIRECT_TO_NON_SECURE_CONNECTION); - } else { - retval = true; } ArrayList data = new ArrayList(); data.add(ocVersion); mLatestResult.setData(data); + retval = true; } } @@ -174,7 +173,7 @@ public class GetRemoteStatusOperation extends RemoteOperation { } else { client.setBaseUri(Uri.parse("https://" + baseUriStr)); boolean httpsSuccess = tryConnection(client); - if (!httpsSuccess && !mLatestResult.isSslRecoverableException() && mLatestResult.isNonSecureRedirection()) { + if (!httpsSuccess && !mLatestResult.isSslRecoverableException()) { Log.d(TAG, "establishing secure connection failed, trying non secure connection"); client.setBaseUri(Uri.parse("http://" + baseUriStr)); tryConnection(client);