Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-15 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include last backup proto size in size calculation.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-09 11:35:22 -04:00
parent c7666626a1
commit 9ab1996f4a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt
View File

@@ -264,7 +264,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
private fun refreshBackupMediaSizeState() {
_state.update {
val (mediaSize, mediaRetentionDays) = getBackupMediaSize(it.tier, (it.backupState as? BackupState.WithTypeAndRenewalTime)?.messageBackupsType)
val (mediaSize, mediaRetentionDays) = getBackupSize(it.tier, (it.backupState as? BackupState.WithTypeAndRenewalTime)?.messageBackupsType)
it.copy(
backupMediaSize = mediaSize,
freeTierMediaRetentionDays = mediaRetentionDays,
@@ -295,7 +295,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
if (paidType is NetworkResult.Success) {
val remoteStorageAllowance = paidType.result.storageAllowanceBytes.bytes
val estimatedSize = getBackupMediaSize(paidType.result.tier, paidType.result).first.bytes
val estimatedSize = getBackupSize(paidType.result.tier, paidType.result).first.bytes
if (estimatedSize + 300.mebiBytes <= remoteStorageAllowance) {
BackupRepository.clearOutOfRemoteStorageSpaceError()
@@ -311,7 +311,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
}
}
val (mediaSize, mediaRetentionDays) = getBackupMediaSize(_state.value.tier, (_state.value.backupState as? BackupState.WithTypeAndRenewalTime)?.messageBackupsType)
val (mediaSize, mediaRetentionDays) = getBackupSize(_state.value.tier, (_state.value.backupState as? BackupState.WithTypeAndRenewalTime)?.messageBackupsType)
_state.update {
it.copy(
@@ -331,7 +331,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
}
}
private fun getBackupMediaSize(tier: MessageBackupTier?, messageBackupsType: MessageBackupsType?): Pair<Long, Int> {
private fun getBackupSize(tier: MessageBackupTier?, messageBackupsType: MessageBackupsType?): Pair<Long, Int> {
if (tier == null) {
return -1L to 0
}
@@ -353,10 +353,10 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
return if (SignalStore.backup.hasBackupBeenUploaded || SignalStore.backup.lastBackupTime > 0L) {
when (tier) {
MessageBackupTier.PAID -> SignalDatabase.attachments.getPaidEstimatedArchiveMediaSize() to -1
MessageBackupTier.PAID -> (SignalStore.backup.lastBackupProtoSize + SignalDatabase.attachments.getPaidEstimatedArchiveMediaSize()) to -1
MessageBackupTier.FREE -> {
if (mediaRetentionDays > 0) {
SignalDatabase.attachments.getFreeEstimatedArchiveMediaSize(System.currentTimeMillis() - mediaRetentionDays.days.inWholeMilliseconds) to mediaRetentionDays
(SignalStore.backup.lastBackupProtoSize + SignalDatabase.attachments.getFreeEstimatedArchiveMediaSize(System.currentTimeMillis() - mediaRetentionDays.days.inWholeMilliseconds)) to mediaRetentionDays
} else {
-1L to -1
}