Skip to content
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.

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

feat(StorageExceeded): Prompt upgrade bottomsheet when user quotas are exceeded #1535

Merged
merged 2 commits into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ open class Drive(
inline val canCreateDropbox get() = pack?.capabilities?.useDropbox == true && (!isFreeTier || quotas.canCreateDropbox)
inline val canCreateShareLink get() = !isFreeTier || quotas.canCreateShareLink

inline val isDriveFull get() = usedSize >= size

fun isUserAdmin(): Boolean = role == DriveUser.Role.ADMIN

fun isDriveUser(): Boolean = role != DriveUser.Role.NONE && role != DriveUser.Role.EXTERNAL
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/com/infomaniak/drive/ui/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,13 @@ class MainActivity : BaseActivity() {

private fun setupFab(fab: FloatingActionButton, shouldShowSmallFab: Boolean = false) {
val args = AddFileBottomSheetDialogArgs(shouldShowSmallFab).toBundle()
fab.setOnClickListener { navController.navigate(R.id.addFileBottomSheetDialog, args) }
fab.setOnClickListener {
if (AccountUtils.getCurrentDrive()?.isDriveFull == true) {
showQuotasExceededSnackbar(navController)
} else {
navController.navigate(R.id.addFileBottomSheetDialog, args)
}
}
}

private fun setupDrivePermissions() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,21 @@ import com.infomaniak.drive.GeniusScanUtils.startScanFlow
import com.infomaniak.drive.MainApplication
import com.infomaniak.drive.MatomoDrive.trackNewElementEvent
import com.infomaniak.drive.R
import com.infomaniak.drive.data.api.ErrorCode
import com.infomaniak.drive.data.models.CreateFile
import com.infomaniak.drive.data.models.File
import com.infomaniak.drive.data.models.File.Office
import com.infomaniak.drive.data.models.UploadFile
import com.infomaniak.drive.data.models.UserDrive
import com.infomaniak.drive.databinding.FragmentBottomSheetAddFileBinding
import com.infomaniak.drive.ui.MainActivity
import com.infomaniak.drive.ui.MainViewModel
import com.infomaniak.drive.ui.fileList.FileListFragment
import com.infomaniak.drive.ui.menu.SharedWithMeFragment
import com.infomaniak.drive.utils.*
import com.infomaniak.drive.utils.AccountUtils.currentUserId
import com.infomaniak.drive.utils.SyncUtils.syncImmediately
import com.infomaniak.lib.core.utils.ApiErrorCode.Companion.translateError
import com.infomaniak.lib.core.utils.context
import com.infomaniak.lib.core.utils.safeBinding
import com.infomaniak.lib.core.utils.safeNavigate
Expand Down Expand Up @@ -197,7 +200,13 @@ class AddFileBottomSheetDialog : BottomSheetDialogFragment() {
showSnackbar(getString(R.string.modalCreateFileSucces, createFile.name), showAboveFab = true)
apiResponse.data?.let { file -> requireContext().openOnlyOfficeActivity(file) }
} else {
showSnackbar(R.string.errorFileAlreadyExists, showAboveFab = true)
val error = apiResponse.translateError()
val quotaErrorCode = ErrorCode.apiErrorCodes.firstOrNull { it.code == ErrorCode.QUOTA_EXCEEDED_ERROR }
if (error == quotaErrorCode?.translateRes) {
(requireActivity() as? MainActivity)?.showQuotasExceededSnackbar(findNavController())
} else {
showSnackbar(error, showAboveFab = true)
}
}
mainViewModel.refreshActivities.value = true
dialog.dismiss()
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/infomaniak/drive/utils/Extensions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.LiveData
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavController
import androidx.navigation.fragment.findNavController
import androidx.work.OneTimeWorkRequest
import androidx.work.OutOfQuotaPolicy
Expand All @@ -65,6 +66,8 @@ import com.google.android.material.shape.CornerFamily
import com.google.android.material.textfield.MaterialAutoCompleteTextView
import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout
import com.infomaniak.core.myksuite.ui.screens.KSuiteApp
import com.infomaniak.core.myksuite.ui.utils.MyKSuiteUiUtils.openMyKSuiteUpgradeBottomSheet
import com.infomaniak.drive.BuildConfig
import com.infomaniak.drive.BuildConfig.SUPPORT_URL
import com.infomaniak.drive.MatomoDrive.trackShareRightsEvent
Expand Down Expand Up @@ -539,3 +542,12 @@ fun Fragment.setupRootPendingFilesIndicator(countLiveData: LiveData<Int>, pendin
pendingFilesView.setUploadFileInProgress(this, OTHER_ROOT_ID)
countLiveData.observe(viewLifecycleOwner, pendingFilesView::updateUploadFileInProgress)
}

fun MainActivity.showQuotasExceededSnackbar(navController: NavController) {
showSnackbar(
title = R.string.errorQuotaExceeded,
anchor = getMainFab(),
actionButtonTitle = R.string.buttonUpgrade,
onActionClicked = { navController.openMyKSuiteUpgradeBottomSheet(KSuiteApp.Drive) },
)
}