mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into newMultiSelect

Browse source
This commit is contained in:
tobiasKaminsky 2016-06-25 10:30:05 +02:00
commit 08a11dd660
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -33,7 +33,7 @@ dependencies {
/// dependencies for app building /// dependencies for app building
compile name: 'touch-image-view' 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:support-v4:${supportLibraryVersion}"
compile "com.android.support:design:${supportLibraryVersion}" compile "com.android.support:design:${supportLibraryVersion}"
compile 'com.jakewharton:disklrucache:2.0.2' compile 'com.jakewharton:disklrucache:2.0.2'
@ -128,4 +128,4 @@ android {
exclude 'META-INF/LICENSE.txt' exclude 'META-INF/LICENSE.txt'
} }
} }

4
src/com/owncloud/android/authentication/AuthenticatorActivity.java
View file

@ -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.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.status.OwnCloudVersion; 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.DetectAuthenticationMethodOperation.AuthenticationMethod;
import com.owncloud.android.operations.GetServerInfoOperation; import com.owncloud.android.operations.GetServerInfoOperation;
import com.owncloud.android.operations.OAuth2GetAccessToken; import com.owncloud.android.operations.OAuth2GetAccessToken;
@ -1030,7 +1030,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
} else if (operation instanceof OAuth2GetAccessToken) { } else if (operation instanceof OAuth2GetAccessToken) {
onGetOAuthAccessTokenFinish(result); onGetOAuthAccessTokenFinish(result);
} else if (operation instanceof GetRemoteUserNameOperation) { } else if (operation instanceof GetRemoteUserInfoOperation) {
onGetUserNameFinish(result); onGetUserNameFinish(result);
} }

4
src/com/owncloud/android/services/OperationsService.java
View file

@ -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.common.utils.Log_OC;
import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.resources.status.OwnCloudVersion; 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.CheckCurrentCredentialsOperation;
import com.owncloud.android.operations.CopyFileOperation; import com.owncloud.android.operations.CopyFileOperation;
import com.owncloud.android.operations.CreateFolderOperation; import com.owncloud.android.operations.CreateFolderOperation;
@ -664,7 +664,7 @@ public class OperationsService extends Service {
} else if (action.equals(ACTION_GET_USER_NAME)) { } else if (action.equals(ACTION_GET_USER_NAME)) {
// Get User Name // Get User Name
operation = new GetRemoteUserNameOperation(); operation = new GetRemoteUserInfoOperation();
} else if (action.equals(ACTION_RENAME)) { } else if (action.equals(ACTION_RENAME)) {
// Rename file or folder // Rename file or folder