From 7b27691a49fe070e6a15a8ddab093fbf53627d64 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 23 Jun 2016 14:44:44 +0200 Subject: [PATCH 1/2] Renames due to https://github.com/nextcloud/android-library/pull/3 --- .../android/authentication/AuthenticatorActivity.java | 4 ++-- src/com/owncloud/android/services/OperationsService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java index c925d21ba8..bfca0f0205 100644 --- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java +++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java @@ -79,7 +79,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.status.OwnCloudVersion; -import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation; +import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation; import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod; import com.owncloud.android.operations.GetServerInfoOperation; import com.owncloud.android.operations.OAuth2GetAccessToken; @@ -1030,7 +1030,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity } else if (operation instanceof OAuth2GetAccessToken) { onGetOAuthAccessTokenFinish(result); - } else if (operation instanceof GetRemoteUserNameOperation) { + } else if (operation instanceof GetRemoteUserInfoOperation) { onGetUserNameFinish(result); } diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java index d34ae93d02..975275040d 100644 --- a/src/com/owncloud/android/services/OperationsService.java +++ b/src/com/owncloud/android/services/OperationsService.java @@ -51,7 +51,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.resources.status.OwnCloudVersion; -import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation; +import com.owncloud.android.lib.resources.users.GetRemoteUserInfoOperation; import com.owncloud.android.operations.CheckCurrentCredentialsOperation; import com.owncloud.android.operations.CopyFileOperation; import com.owncloud.android.operations.CreateFolderOperation; @@ -643,7 +643,7 @@ public class OperationsService extends Service { } else if (action.equals(ACTION_GET_USER_NAME)) { // Get User Name - operation = new GetRemoteUserNameOperation(); + operation = new GetRemoteUserInfoOperation(); } else if (action.equals(ACTION_RENAME)) { // Rename file or folder From 5ee1e8adab493c32f689a54cf7a959d109d7118a Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 24 Jun 2016 00:18:45 +0200 Subject: [PATCH 2/2] Set fixed lib version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f14708dc08..1a2e0b0930 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ dependencies { /// dependencies for app building compile name: 'touch-image-view' - compile 'com.github.nextcloud:android-library:-SNAPSHOT' + compile 'com.github.nextcloud:android-library:1.0.1' compile "com.android.support:support-v4:${supportLibraryVersion}" compile "com.android.support:design:${supportLibraryVersion}" compile 'com.jakewharton:disklrucache:2.0.2' @@ -128,4 +128,4 @@ android { exclude 'META-INF/LICENSE.txt' } -} \ No newline at end of file +}