diff --git a/Mixin/Service/DeviceTransfer/DeviceTransferClient.swift b/Mixin/Service/DeviceTransfer/DeviceTransferClient.swift index 293600ee27..7a44df501b 100644 --- a/Mixin/Service/DeviceTransfer/DeviceTransferClient.swift +++ b/Mixin/Service/DeviceTransfer/DeviceTransferClient.swift @@ -8,7 +8,7 @@ final class DeviceTransferClient { case idle case transfer(progress: Double, speed: String) case closed(DeviceTransferClosedReason) - case importing(progress: Double) + case importing(progress: Float) case finished } @@ -326,7 +326,7 @@ extension DeviceTransferClient { extension DeviceTransferClient: DeviceTransferDataWriterDelegate { - func deviceTransferDataWriter(_ writer: DeviceTransferDataWriter, update progress: Double) { + func deviceTransferDataWriter(_ writer: DeviceTransferDataWriter, update progress: Float) { if progress >= 1 { Logger.general.info(category: "DeviceTransferClient", message: "Import finished") ConversationDAO.shared.updateLastMessageIdAndCreatedAt() diff --git a/Mixin/Service/DeviceTransfer/DeviceTransferDataWriter.swift b/Mixin/Service/DeviceTransfer/DeviceTransferDataWriter.swift index 2351acffc4..0220742ee1 100644 --- a/Mixin/Service/DeviceTransfer/DeviceTransferDataWriter.swift +++ b/Mixin/Service/DeviceTransfer/DeviceTransferDataWriter.swift @@ -3,7 +3,7 @@ import MixinServices protocol DeviceTransferDataWriterDelegate: AnyObject { - func deviceTransferDataWriter(_ writer: DeviceTransferDataWriter, update progress: Double) + func deviceTransferDataWriter(_ writer: DeviceTransferDataWriter, update progress: Float) } @@ -130,7 +130,7 @@ extension DeviceTransferDataWriter { } } } else { - let progress = Double(self.parsedRecordCount) / Double(self.totalRecordCount + 1) + let progress = Float(self.parsedRecordCount) / Float(self.totalRecordCount + 1) delegate.deviceTransferDataWriter(self, update: progress) } } diff --git a/Mixin/UserInterface/Controllers/DeviceTransfer/DeviceTransferProgressViewController.swift b/Mixin/UserInterface/Controllers/DeviceTransfer/DeviceTransferProgressViewController.swift index aaabf62e2f..1234b7de78 100644 --- a/Mixin/UserInterface/Controllers/DeviceTransfer/DeviceTransferProgressViewController.swift +++ b/Mixin/UserInterface/Controllers/DeviceTransfer/DeviceTransferProgressViewController.swift @@ -226,9 +226,9 @@ extension DeviceTransferProgressViewController { } } - private func updateTitleLabel(with importProgress: Double) { + private func updateTitleLabel(with importProgress: Float) { titleLabel.text = R.string.localizable.importing_chat_progress(String(format: "%.2f", importProgress * 100)) - progressView.progress = Float(importProgress) + progressView.progress = importProgress } private func importFinished() {