diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.kt b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.kt index 0a66a9049cab..417391fb94fa 100644 --- a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.kt +++ b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.kt @@ -68,11 +68,11 @@ class AuthenticatorAsyncTask(activity: Activity) : AsyncTask if (operation.wasRedirected()) { - val redirectionPath = operation.redirectionPath - val permanentLocation = redirectionPath.lastPermanentLocation + val redirectionPath = operation.getRedirectionPath() + val permanentLocation = redirectionPath?.lastPermanentLocation result.lastPermanentLocation = permanentLocation } - result.setResultData(userInfoResult.resultData) + result.resultData = userInfoResult.resultData } else { result = userInfoResult } diff --git a/app/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java b/app/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java index c1a5f7ea5e35..c2067d38a609 100644 --- a/app/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java +++ b/app/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java @@ -72,12 +72,12 @@ public DetectAuthenticationMethodOperation(Context context) { protected RemoteOperationResult run(OwnCloudClient client) { AuthenticationMethod authMethod = AuthenticationMethod.UNKNOWN; - RemoteOperation operation = new ExistenceCheckRemoteOperation("", mContext, false); + final var operation = new ExistenceCheckRemoteOperation("", false); client.clearCredentials(); client.setFollowRedirects(false); // try to access the root folder, following redirections but not SAML SSO redirections - RemoteOperationResult result = operation.execute(client); + var result = operation.execute(client); String redirectedLocation = result.getRedirectedLocation(); while (!TextUtils.isEmpty(redirectedLocation) && !result.isIdPRedirection()) { client.setBaseUri(Uri.parse(result.getRedirectedLocation())); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 45ac72b691bd..7f3fdfe1e174 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ androidCommonLibraryVersion = "0.33.2" androidGifDrawableVersion = "1.2.31" androidImageCropperVersion = "4.7.0" -androidLibraryVersion ="585167def26283bef327a5a44520a77f327382d9" +androidLibraryVersion ="0b71157f37" androidPluginVersion = "9.1.0" androidsvgVersion = "1.4" androidxMediaVersion = "1.5.1" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index c624e5e302a6..57030320a7a2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -20805,6 +20805,14 @@ + + + + + + + +