Explorar o código

Update fields

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk hai 1 ano
pai
achega
3538e8b485

+ 5 - 2
app/src/main/java/com/nextcloud/client/database/entity/FileEntity.kt

@@ -78,10 +78,13 @@ data class FileEntity(
     val isDownloading: Int?,
     @ColumnInfo(name = ProviderTableMeta.FILE_FAVORITE)
     val favorite: Int?,
-    @ColumnInfo(name = ProviderTableMeta.FILE_IS_ENCRYPTED)
-    val hidden: Int?,
+
     @ColumnInfo(name = ProviderTableMeta.FILE_HIDDEN)
+    val hidden: Int?,
+
+    @ColumnInfo(name = ProviderTableMeta.FILE_IS_ENCRYPTED)
     val isEncrypted: Int?,
+
     @ColumnInfo(name = ProviderTableMeta.FILE_ETAG_IN_CONFLICT)
     val etagInConflict: String?,
     @ColumnInfo(name = ProviderTableMeta.FILE_SHARED_WITH_SHAREE)

+ 1 - 0
app/src/main/java/com/owncloud/android/operations/SynchronizeFileOperation.java

@@ -254,6 +254,7 @@ public class SynchronizeFileOperation extends SyncOperation {
                     } else {
                         // TODO CHECK: is this really useful in some point in the code?
                         mServerFile.setFavorite(mLocalFile.isFavorite());
+                        mServerFile.setHidden(mLocalFile.getHidden());
                         mServerFile.setLastSyncDateForData(mLocalFile.getLastSyncDateForData());
                         mServerFile.setStoragePath(mLocalFile.getStoragePath());
                         mServerFile.setParentId(mLocalFile.getParentId());

+ 5 - 4
app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

@@ -692,7 +692,11 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
         }
         if (mStorageManager != null) {
             mFiles = mStorageManager.getFolderContent(directory, onlyOnDevice);
-
+            mFiles.forEach(file -> {
+                if (file.getHidden()) {
+                    Log_OC.d("","FOUND HIDDEN FILE!");
+                }
+            });
             if (!preferences.isShowHiddenFilesEnabled()) {
                 mFiles = filterHiddenFiles(mFiles);
             }
@@ -701,9 +705,6 @@ public class OCFileListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
             }
             sortOrder = preferences.getSortOrderByFolder(directory);
             mFiles = sortOrder.sortCloudFiles(mFiles);
-            mFiles.forEach(file -> {
-                Log_OC.d("","isHidden:" + file.getHidden());
-            });
             mergeOCFilesForLivePhoto();
             mFilesAll.clear();
             mFilesAll.addAll(mFiles);

+ 1 - 0
app/src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -238,6 +238,7 @@ public final class FileStorageUtils {
         file.setRemoteId(remote.getRemoteId());
         file.setLocalId(remote.getLocalId());
         file.setFavorite(remote.isFavorite());
+        file.setHidden(remote.getHidden());
         if (file.isFolder()) {
             file.setEncrypted(remote.isEncrypted());
         }