Skip to content

Commit dfc8041

Browse files
davigonzdavigonz
authored
Merge pull request #2341 from owncloud/release_2.9.1
Release 2.9.1
2 parents bd07b13 + 5d500ae commit dfc8041

12 files changed

+33
-21
lines changed

Diff for: ‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.9.1 (November 2018)
2+
- Bug fixes for LDAP users using uid:
3+
+ Fix login not working
4+
+ Fix empty list of files
5+
16
## 2.9.0 (November 2018)
27
- Search in current folder
38
- Select all/inverse files (contribution)

Diff for: ‎build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ android {
9797
compileSdkVersion 26
9898

9999
defaultConfig {
100-
manifestPlaceholders.versionCode = "20900000"
101-
manifestPlaceholders.versionName = "2.9.0"
100+
manifestPlaceholders.versionCode = "20900100"
101+
manifestPlaceholders.versionName = "2.9.1"
102102

103103
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
104104

Diff for: ‎owncloud-android-library

Submodule owncloud-android-library updated 15 files

Diff for: ‎src/com/owncloud/android/authentication/AccountUtils.java

-1
Original file line numberDiff line numberDiff line change
@@ -335,5 +335,4 @@ public static OwnCloudVersion getServerVersion(Account account) {
335335
}
336336
return serverVersion;
337337
}
338-
339338
}

Diff for: ‎src/com/owncloud/android/authentication/AuthenticatorAsyncTask.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* ownCloud Android client application
33
*
44
* @author masensio on 09/02/2015.
5-
* Copyright (C) 2016 ownCloud GmbH.
5+
* Copyright (C) 2018 ownCloud GmbH.
66
*
77
* This program is free software: you can redistribute it and/or modify
88
* it under the terms of the GNU General Public License version 2,
@@ -67,7 +67,8 @@ protected RemoteOperationResult doInBackground(Object... params) {
6767
// Operation - try credentials
6868
ExistenceCheckRemoteOperation existenceCheckRemoteOperation = new ExistenceCheckRemoteOperation(
6969
REMOTE_PATH,
70-
SUCCESS_IF_ABSENT
70+
SUCCESS_IF_ABSENT,
71+
true
7172
);
7273
result = existenceCheckRemoteOperation.execute(client);
7374

Diff for: ‎src/com/owncloud/android/features/FeatureList.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,13 @@ public class FeatureList {
5757
new FeatureItem(R.drawable.whats_new_video_streaming, R.string.welcome_feature_5_title,
5858
R.string.welcome_feature_5_text, "2.7.0", "0", SHOW_ON_FIRST_RUN),
5959

60-
// Features introduced in 2.9.0
60+
// Features introduced in 2.9.1
6161
new FeatureItem(R.drawable.whats_new_current_folder_search, R.string.welcome_feature_6_title,
62-
R.string.welcome_feature_6_text, "2.9.0", "0", SHOW_ON_UPGRADE),
62+
R.string.welcome_feature_6_text, "2.9.1", "0", SHOW_ON_UPGRADE),
6363
new FeatureItem(R.drawable.whats_new_select_all, R.string.welcome_feature_7_title,
64-
R.string.welcome_feature_7_text, "2.9.0", "0", SHOW_ON_UPGRADE),
64+
R.string.welcome_feature_7_text, "2.9.1", "0", SHOW_ON_UPGRADE),
6565
new FeatureItem(R.drawable.whats_new_av_offline_jobs, R.string.welcome_feature_8_title,
66-
R.string.welcome_feature_8_text, "2.9.0", "0", SHOW_ON_UPGRADE)
67-
66+
R.string.welcome_feature_8_text, "2.9.1", "0", SHOW_ON_UPGRADE)
6867
};
6968

7069

Diff for: ‎src/com/owncloud/android/operations/CheckCurrentCredentialsOperation.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*
44
* @author David A. Velasco
55
* @author Christian Schabesberger
6+
* @author David González Verdugo
67
* Copyright (C) 2018 ownCloud GmbH.
78
*
89
* This program is free software: you can redistribute it and/or modify
@@ -52,7 +53,8 @@ protected RemoteOperationResult<Account> run(OwnCloudClient client) {
5253
return new RemoteOperationResult<>(new IllegalStateException(
5354
"Account to validate is not the account connected to!"));
5455
} else {
55-
RemoteOperation check = new ExistenceCheckRemoteOperation(OCFile.ROOT_PATH, false);
56+
RemoteOperation check = new ExistenceCheckRemoteOperation(OCFile.ROOT_PATH, false,
57+
false);
5658
final RemoteOperationResult existenceCheckResult = check.execute(client);
5759
final RemoteOperationResult<Account> result
5860
= new RemoteOperationResult<>(existenceCheckResult.getCode());

Diff for: ‎src/com/owncloud/android/operations/DetectAuthenticationMethodOperation.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
* ownCloud Android client application
33
*
44
* @author David A. Velasco
5-
* Copyright (C) 2017 ownCloud GmbH.
5+
* @author David González Verdugo
6+
* Copyright (C) 2018 ownCloud GmbH.
67
*
78
* This program is free software: you can redistribute it and/or modify
89
* it under the terms of the GNU General Public License version 2,
@@ -61,7 +62,8 @@ public class DetectAuthenticationMethodOperation extends RemoteOperation<List<Au
6162
protected RemoteOperationResult<List<AuthenticationMethod>> run(OwnCloudClient client) {
6263
ArrayList<AuthenticationMethod> allAvailableAuthMethods = new ArrayList<>();
6364

64-
ExistenceCheckRemoteOperation operation = new ExistenceCheckRemoteOperation("", false);
65+
ExistenceCheckRemoteOperation operation = new ExistenceCheckRemoteOperation("", false,
66+
false);
6567
client.clearCredentials();
6668

6769
client.setFollowRedirects(false);

Diff for: ‎src/com/owncloud/android/operations/GetUserProfileOperation.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ public GetUserProfileOperation (String remotePath) {
7373
*/
7474
@Override
7575
protected RemoteOperationResult run(OwnCloudClient client) {
76-
77-
7876
UserProfile userProfile;
7977

8078
try {
@@ -94,6 +92,11 @@ protected RemoteOperationResult run(OwnCloudClient client) {
9492
AccountUtils.Constants.KEY_DISPLAY_NAME, // keep also there, for the moment
9593
userInfo.mDisplayName
9694
);
95+
accountManager.setUserData(
96+
storedAccount,
97+
AccountUtils.Constants.KEY_ID,
98+
userInfo.mId
99+
);
97100

98101
// map user info into UserProfile instance
99102
userProfile = new UserProfile(

Diff for: ‎src/com/owncloud/android/operations/RemoveShareOperation.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
* ownCloud Android client application
33
*
44
* @author David A. Velasco
5-
* Copyright (C) 2017 ownCloud GmbH.
5+
* @author David González Verdugo
6+
* Copyright (C) 2018 ownCloud GmbH.
67
*
78
* This program is free software: you can redistribute it and/or modify
89
* it under the terms of the GNU General Public License version 2,
@@ -109,7 +110,7 @@ protected RemoteOperationResult<ShareParserResult> run(OwnCloudClient client) {
109110

110111
private boolean notExistFile(OwnCloudClient client, String remotePath){
111112
ExistenceCheckRemoteOperation existsOperation =
112-
new ExistenceCheckRemoteOperation(remotePath, true);
113+
new ExistenceCheckRemoteOperation(remotePath, true, false);
113114
RemoteOperationResult result = existsOperation.execute(client);
114115
return result.isSuccess();
115116
}

Diff for: ‎src/com/owncloud/android/operations/SynchronizeFolderOperation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ private void mergeRemoteFolder(ArrayList<RemoteFile> folderAndFiles)
324324
int foldersToExpand = 0;
325325
for (int i=1; i<folderAndFiles.size(); i++) {
326326
/// new OCFile instance with the data from the server
327-
r = (RemoteFile) folderAndFiles.get(i);
327+
r = folderAndFiles.get(i);
328328
remoteFile = FileStorageUtils.createOCFileFrom(r);
329329

330330
/// new OCFile instance to merge fresh data from server with local state

Diff for: ‎src/com/owncloud/android/operations/UploadFileOperation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ private boolean delayForWifi() {
502502
* will be uploaded.
503503
*/
504504
private RemoteOperationResult grantFolderExistence(String pathToGrant, OwnCloudClient client) {
505-
RemoteOperation operation = new ExistenceCheckRemoteOperation(pathToGrant, false);
505+
RemoteOperation operation = new ExistenceCheckRemoteOperation(pathToGrant, false, false);
506506
RemoteOperationResult result = operation.execute(client);
507507
if (!result.isSuccess() && result.getCode() == ResultCode.FILE_NOT_FOUND && mRemoteFolderToBeCreated) {
508508
SyncOperation syncOp = new CreateFolderOperation(pathToGrant, true);
@@ -608,7 +608,7 @@ private String getAvailableRemotePath(OwnCloudClient wc, String remotePath) {
608608

609609
private boolean existsFile(OwnCloudClient client, String remotePath){
610610
ExistenceCheckRemoteOperation existsOperation =
611-
new ExistenceCheckRemoteOperation(remotePath, false);
611+
new ExistenceCheckRemoteOperation(remotePath, false, false);
612612
RemoteOperationResult result = existsOperation.execute(client);
613613
return result.isSuccess();
614614
}

0 commit comments

Comments
 (0)