Skip to content

Commit 18c1133

Browse files
committed
fix: shared sub file visibility
Signed-off-by: alperozturk <[email protected]>
1 parent 199b14d commit 18c1133

File tree

2 files changed

+1
-25
lines changed

2 files changed

+1
-25
lines changed

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import com.nextcloud.client.database.entity.OfflineOperationEntity;
4444
import com.nextcloud.client.jobs.offlineOperations.repository.OfflineOperationsRepository;
4545
import com.nextcloud.client.jobs.offlineOperations.repository.OfflineOperationsRepositoryType;
46-
import com.nextcloud.model.OCFileFilterType;
4746
import com.nextcloud.model.OfflineOperationRawType;
4847
import com.nextcloud.model.OfflineOperationType;
4948
import com.nextcloud.model.ShareeEntry;
@@ -2755,29 +2754,6 @@ public boolean isPartOfInternalTwoWaySync(OCFile file) {
27552754
return false;
27562755
}
27572756

2758-
public List<OCFile> filter(OCFile file, OCFileFilterType filterType) {
2759-
if (!file.isRootDirectory()) {
2760-
return getFolderContent(file,false);
2761-
}
2762-
2763-
final List<OCFile> result = new ArrayList<>();
2764-
final List<OCFile> allFiles = getAllFiles();
2765-
for (OCFile ocFile: allFiles) {
2766-
boolean condition = false;
2767-
if (filterType == OCFileFilterType.Shared) {
2768-
condition = ocFile.isShared();
2769-
} else if (filterType == OCFileFilterType.Favorite) {
2770-
condition = ocFile.isFavorite();
2771-
}
2772-
2773-
if (condition) {
2774-
result.add(ocFile);
2775-
}
2776-
}
2777-
2778-
return result;
2779-
}
2780-
27812757
@Nullable
27822758
public FileEntity getFileEntity(OCFile file) {
27832759
if (file == null) {

app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class OCFileListAdapterHelper {
9090
}
9191
}
9292

93-
if (isSharedView && !file.isShared) {
93+
if (isSharedView && !file.isShared && !directory.isShared) {
9494
continue
9595
}
9696

0 commit comments

Comments
 (0)