Merge pull request #2071 from nextcloud/e2eFlagOnlyOnFolders

E2e flag only on folders

src/main/java/com/owncloud/android/datamodel/OCFile.java

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

src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -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;
     }