Skip to content

existence-check-operation: update usage #16694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alperozturk96 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −6
Open

existence-check-operation: update usage #16694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ class AuthenticatorAsyncTask(activity: Activity) : AsyncTask<Any?, Void?, Remote
@Suppress("UNCHECKED_CAST")
result = operation.execute(client) as RemoteOperationResult<UserInfo?>
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
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20805,6 +20805,14 @@
<sha256 value="1766b0b02fe18a2f24687a75e350c157eeb1bcb5a5f13b0c9bb01d88709e842f" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="0b71157f37">
<artifact name="android-library-0b71157f37.aar">
<sha256 value="56938c83b44ae0bc39c2750d6e741ca8bafe26c71d732882c75e14ff93b5937d" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-0b71157f37.module">
<sha256 value="a1055a75ebdafe45e3c236aedab7f73a858704046b4b5720d97f64081f8ad5b7" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="0bc996e6b6">
<artifact name="android-library-0bc996e6b6.aar">
<sha256 value="944bc1de6496e567dd53573007a81102788f869d6ad83f6690f3cb4a156e1280" origin="Generated by Gradle" reason="Artifact is not signed"/>
Expand Down
Loading