Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update remote backups settings to align with design.

Browse Source
This commit is contained in:
Alex Hart
2024-10-15 16:51:38 -03:00
committed by Greyson Parrelli
parent 6a77631b09
commit b073005ff9
7 changed files with 516 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
View File

@@ -57,6 +57,7 @@ import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob
import org.thoughtcrime.securesms.keyvalue.KeyValueStore
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.net.SignalNetwork
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.toMillis
import org.whispersystems.signalservice.api.NetworkResult
@@ -73,6 +74,7 @@ import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil
import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener
import org.whispersystems.signalservice.api.push.ServiceId.ACI
import org.whispersystems.signalservice.api.push.ServiceId.PNI
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
import org.whispersystems.signalservice.internal.push.AttachmentUploadForm
import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
@@ -113,9 +115,24 @@ object BackupRepository {
}
@WorkerThread
fun turnOffAndDeleteBackup() {
RecurringInAppPaymentRepository.cancelActiveSubscriptionSync(InAppPaymentSubscriberRecord.Type.BACKUP)
SignalStore.backup.disableBackups()
fun turnOffAndDeleteBackup(): Boolean {
return try {
Log.d(TAG, "Attempting to disable backups.")
getBackupTier().runIfSuccessful { tier ->
if (tier == MessageBackupTier.PAID) {
Log.d(TAG, "User is currently on a paid tier. Canceling.")
RecurringInAppPaymentRepository.cancelActiveSubscriptionSync(InAppPaymentSubscriberRecord.Type.BACKUP)
Log.d(TAG, "Successfully canceled paid tier.")
}
}
Log.d(TAG, "Disabling backups.")
SignalStore.backup.disableBackups()
true
} catch (e: Exception) {
Log.w(TAG, "Failed to turn off backups.", e)
false
}
}
private fun createSignalDatabaseSnapshot(baseName: String): SignalDatabase {
@@ -515,6 +532,25 @@ object BackupRepository {
}
}
/**
* If backups are initialized, this method will query the server for the current backup level.
* If backups are not initialized, this method will return either the stored tier or a 404 result.
*/
fun getBackupTier(): NetworkResult<MessageBackupTier> {
return if (SignalStore.backup.backupsInitialized) {
getBackupTier(Recipient.self().requireAci())
} else if (SignalStore.backup.backupTier != null) {
NetworkResult.Success(SignalStore.backup.backupTier!!)
} else {
NetworkResult.StatusCodeError(NonSuccessfulResponseCodeException(404))
}
}
/**
* Grabs the backup tier for the given ACI. Note that this will set the user's backup
* tier to FREE if they are not on PAID, so avoid this method if you don't intend that
* to be the case.
*/
private fun getBackupTier(aci: ACI): NetworkResult<MessageBackupTier> {
val backupKey = SignalStore.svr.getOrCreateMasterKey().deriveBackupKey()