Skip to content

Show only offline-available actions when offline in the "create new" menu #17604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 3 commits into from
Sep 16, 2026
Merged

Show only offline-available actions when offline in the "create new" menu #17604

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a66b8e
Show only offline-available actions when offline, and align shown act…
daniele-verducci Sep 10, 2026
700a813
Fixed edge case
daniele-verducci Sep 10, 2026
5c294f5
Use suspend functions
daniele-verducci Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import androidx.appcompat.content.res.AppCompatResources
import androidx.core.content.ContextCompat
import androidx.core.view.isEmpty
import androidx.core.view.isNotEmpty
import androidx.lifecycle.lifecycleScope
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.button.MaterialButton
import com.google.gson.Gson
Expand All @@ -30,6 +31,7 @@ import com.nextcloud.client.di.Injectable
import com.nextcloud.client.documentscan.AppScanOptionalFeature
import com.nextcloud.utils.BuildHelper.isFlavourGPlay
import com.nextcloud.utils.EditorUtils
import com.nextcloud.utils.extensions.isNetworkAndServerAvailableSuspended
import com.nextcloud.utils.extensions.isTemplateAvailable
import com.nextcloud.utils.extensions.setVisibleIf
import com.owncloud.android.MainApp
Expand All @@ -44,6 +46,9 @@ import com.owncloud.android.utils.MimeTypeUtil
import com.owncloud.android.utils.PermissionUtil
import com.owncloud.android.utils.theme.ThemeUtils
import com.owncloud.android.utils.theme.ViewThemeUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext

@Suppress("LongParameterList")
class OCFileListBottomSheetDialog(
Expand Down Expand Up @@ -419,20 +424,20 @@ class OCFileListBottomSheetDialog(
}

private fun filterActionsForOfflineOperations() {
Comment thread
daniele-verducci marked this conversation as resolved.
fileActivity.connectivityService.isNetworkAndServerAvailable { result: Boolean? ->
if (file.isRootDirectory) {
return@isNetworkAndServerAvailable
lifecycleScope.launch {
val available = fileActivity.connectivityService.isNetworkAndServerAvailableSuspended()
if (available && (!file.isOfflineOperation || file.isRootDirectory)) {
return@launch
}
hideCreationOptions()
}
}

if (!result!! || file.isOfflineOperation) {
binding.run {
menuCreateRichWorkspace.visibility = View.GONE
menuUploadFromApp.visibility = View.GONE
menuDirectCameraUpload.visibility = View.GONE
menuScanDocUpload.visibility = View.GONE
creatorsOverviewContainer.visibility = View.GONE
}
}
private suspend fun hideCreationOptions() = withContext(Dispatchers.Main) {
binding.run {
menuCreateRichWorkspace.visibility = View.GONE
creatorsOverviewContainer.visibility = View.GONE
menuEncryptedMkdir.visibility = View.GONE
}
}

Expand Down
Loading