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

Merge pull request #2071 from nextcloud/e2eFlagOnlyOnFolders

Browse source 
E2e flag only on folders
This commit is contained in:
Mario Đanić 2018-01-30 19:24:22 +01:00 committed by GitHub
commit f4670cf602
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/owncloud/android/datamodel/OCFile.java
View file

@ -503,6 +503,8 @@ public class OCFile implements Parcelable, Comparable<OCFile> {
mEtagInConflict = null;
mShareWithSharee = false;
mIsFavorite = false;
mIsEncrypted = false;
mEncryptedFileName = null;
}
/**

4
src/main/java/com/owncloud/android/utils/FileStorageUtils.java
View file

@ -217,7 +217,9 @@ public class FileStorageUtils {
file.setPermissions(remote.getPermissions());
file.setRemoteId(remote.getRemoteId());
file.setFavorite(remote.getIsFavorite());
file.setEncrypted(remote.getIsEncrypted());
if (file.isFolder()) {
file.setEncrypted(remote.getIsEncrypted());
}
return file;
}