-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into dev
- Loading branch information
Showing
6 changed files
with
207 additions
and
245 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
121 changes: 0 additions & 121 deletions
121
app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.java
This file was deleted.
Oops, something went wrong.
115 changes: 115 additions & 0 deletions
115
app/src/main/java/com/owncloud/android/authentication/AuthenticatorAsyncTask.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* | ||
| * ownCloud Android client application | ||
| * | ||
| * @author masensio on 09/02/2015. | ||
| * Copyright (C) 2015 ownCloud Inc. | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2, | ||
| * as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| @file:Suppress("DEPRECATION") | ||
|
|
||
| package com.owncloud.android.authentication | ||
|
|
||
| import android.app.Activity | ||
| import android.content.Context | ||
| import android.net.Uri | ||
| import android.os.AsyncTask | ||
| import com.owncloud.android.datamodel.OCFile | ||
| import com.owncloud.android.lib.common.OwnCloudClientFactory | ||
| import com.owncloud.android.lib.common.OwnCloudCredentials | ||
| import com.owncloud.android.lib.common.UserInfo | ||
| import com.owncloud.android.lib.common.operations.RemoteOperationResult | ||
| import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation | ||
| import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation | ||
| import java.lang.ref.WeakReference | ||
|
|
||
| /** | ||
| * Async Task to verify the credentials of a user | ||
| */ | ||
|
|
||
| class AuthenticatorAsyncTask(activity: Activity) : AsyncTask<Any?, Void?, RemoteOperationResult<UserInfo?>?>() { | ||
| private val mWeakContext: WeakReference<Context?> | ||
| private val mListener: WeakReference<OnAuthenticatorTaskListener> | ||
|
|
||
| init { | ||
| mWeakContext = WeakReference(activity.applicationContext) | ||
| mListener = WeakReference(activity as OnAuthenticatorTaskListener) | ||
| } | ||
|
|
||
| @Deprecated("Deprecated in Java") | ||
| override fun doInBackground(vararg params: Any?): RemoteOperationResult<UserInfo?> { | ||
| val result: RemoteOperationResult<UserInfo?> | ||
|
|
||
| if (params.size == 2 && mWeakContext.get() != null) { | ||
| val url = params[0] as String | ||
| val credentials = params[1] as OwnCloudCredentials | ||
| val context = mWeakContext.get() | ||
|
|
||
| // Client | ||
| val uri = Uri.parse(url) | ||
| val nextcloudClient = OwnCloudClientFactory.createNextcloudClient( | ||
| uri, | ||
| credentials.username, | ||
| credentials.toOkHttpCredentials(), | ||
| context, | ||
| true | ||
| ) | ||
|
|
||
| // Operation - get display name | ||
| val userInfoResult = GetUserInfoRemoteOperation().execute(nextcloudClient) | ||
|
|
||
| // Operation - try credentials | ||
| if (userInfoResult.isSuccess) { | ||
| val client = OwnCloudClientFactory.createOwnCloudClient(uri, context, true) | ||
| client.userId = userInfoResult.resultData?.id | ||
| client.credentials = credentials | ||
| val operation = ExistenceCheckRemoteOperation(OCFile.ROOT_PATH, SUCCESS_IF_ABSENT) | ||
|
|
||
| @Suppress("UNCHECKED_CAST") | ||
| result = operation.execute(client) as RemoteOperationResult<UserInfo?> | ||
| if (operation.wasRedirected()) { | ||
| val redirectionPath = operation.redirectionPath | ||
| val permanentLocation = redirectionPath.lastPermanentLocation | ||
| result.lastPermanentLocation = permanentLocation | ||
| } | ||
| result.setResultData(userInfoResult.resultData) | ||
| } else { | ||
| result = userInfoResult | ||
| } | ||
| } else { | ||
| result = RemoteOperationResult<UserInfo?>(RemoteOperationResult.ResultCode.UNKNOWN_ERROR) | ||
| } | ||
|
|
||
| return result | ||
| } | ||
|
|
||
| @Deprecated("Deprecated in Java") | ||
| override fun onPostExecute(result: RemoteOperationResult<UserInfo?>?) { | ||
| result?.let { | ||
| val listener = mListener.get() | ||
| listener?.onAuthenticatorTaskCallback(it) | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * Interface to retrieve data from recognition task | ||
| */ | ||
| interface OnAuthenticatorTaskListener { | ||
| fun onAuthenticatorTaskCallback(result: RemoteOperationResult<UserInfo?>?) | ||
| } | ||
|
|
||
| companion object { | ||
| private const val SUCCESS_IF_ABSENT = false | ||
| } | ||
| } |
Oops, something went wrong.