diff options
author | tobiasKaminsky <tobias@kaminsky.me> | 2022-11-01 12:44:28 +0300 |
---|---|---|
committer | tobiasKaminsky <tobias@kaminsky.me> | 2022-11-01 12:44:28 +0300 |
commit | 4d20f1ca68ecedf8a79f19237d6bcb208aa482e1 (patch) | |
tree | 718ea4e2e613a162df0162bad7fc48ea32f8ae46 | |
parent | 6f826bbd8d5a341e163d61e250bca97a3ea57977 (diff) |
Check if e2e is available in DocumentsStorageProvidere2eDocumentNotSetup
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
-rw-r--r-- | app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java b/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java index bb993419a0..67b2535c6d 100644 --- a/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java +++ b/app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java @@ -70,6 +70,7 @@ import com.owncloud.android.operations.RefreshFolderOperation; import com.owncloud.android.operations.RemoveFileOperation; import com.owncloud.android.operations.RenameFileOperation; import com.owncloud.android.ui.activity.SettingsActivity; +import com.owncloud.android.ui.helpers.FileOperationsHelper; import com.owncloud.android.utils.FileStorageUtils; import com.owncloud.android.utils.FileUtil; import com.owncloud.android.utils.MimeTypeUtil; @@ -165,9 +166,17 @@ public class DocumentsStorageProvider extends DocumentsProvider { Context context = getNonNullContext(); Document parentFolder = toDocument(parentDocumentId); - FileDataStorageManager storageManager = parentFolder.getStorageManager(); final FileCursor resultCursor = new FileCursor(projection); + if (parentFolder.getFile().isEncrypted() && + !FileOperationsHelper.isEndToEndEncryptionSetup(context, parentFolder.getUser())) { + Toast.makeText(context, R.string.e2e_not_yet_setup, Toast.LENGTH_LONG).show(); + return resultCursor; + } + + FileDataStorageManager storageManager = parentFolder.getStorageManager(); + + for (OCFile file : storageManager.getFolderContent(parentFolder.getFile(), false)) { resultCursor.addFile(new Document(storageManager, file)); } |