mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-21 00:59:49 +01:00
Check remaining attachment size before launching service.
This commit is contained in:
@@ -256,6 +256,16 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
launch {
|
||||
mainNavigationViewModel.backupStatus.collect { remainingRestoreSize ->
|
||||
if (SignalStore.backup.restoreState == RestoreState.RESTORING_MEDIA && remainingRestoreSize != 0L) {
|
||||
Log.i(TAG, "Still restoring media, launching a service. Remaining restoration size: $remainingRestoreSize")
|
||||
BackupMediaRestoreService.resetTimeout()
|
||||
BackupMediaRestoreService.start(this@MainActivity, resources.getString(R.string.BackupStatus__restoring_media))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val callback = object : OnBackPressedCallback(toolbarViewModel.state.value.mode == MainToolbarMode.ACTION_MODE) {
|
||||
@@ -272,12 +282,6 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
|
||||
}
|
||||
}
|
||||
|
||||
if (SignalStore.backup.restoreState == RestoreState.RESTORING_MEDIA) {
|
||||
Log.i(TAG, "Still restoring media, launching a service.")
|
||||
BackupMediaRestoreService.resetTimeout()
|
||||
BackupMediaRestoreService.start(this, resources.getString(R.string.BackupStatus__restoring_media))
|
||||
}
|
||||
|
||||
onBackPressedDispatcher.addCallback(this, callback)
|
||||
|
||||
shareDataTimestampViewModel.setTimestampFromActivityCreation(savedInstanceState, intent)
|
||||
|
||||
Reference in New Issue
Block a user