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.

Sign up for GitHub

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

Feature/refactor backup #504

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/refactor backup #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14b6c9e
Refactor backup
Jun 27, 2020
7eaa300
Improve backup
Jun 28, 2020
4258684
Slight fix
Jun 30, 2020
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
6 changes: 5 additions & 1 deletion Mixin/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,11 @@ extension AppDelegate {

if NetworkManager.shared.isReachableOnWiFi {
if AppGroupUserDefaults.User.autoBackup != .off || AppGroupUserDefaults.Account.hasUnfinishedBackup {
BackupJobQueue.shared.addJob(job: BackupJob())
if let backupJob = BackupJobQueue.shared.backupJob {
backupJob.checkUploadStatus()
} else {
BackupJobQueue.shared.addJob(job: BackupJob())
}
}
if AppGroupUserDefaults.Account.canRestoreMedia {
BackupJobQueue.shared.addJob(job: RestoreJob())
Expand Down
4 changes: 2 additions & 2 deletions Mixin/Resources/zh-Hans.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,8 +750,8 @@
"setting_backup_tips" = "备份你的聊天记录到 iCloud。如果你丢失或者更换手机，你可以在重新安装 Mixin Messenger 时恢复你的聊天记录。注意备份到 iCloud 中的聊天记录不受端对端加密保护！";
"setting_backup_auto_tips" = "只会在 Wi-Fi 下自动备份聊天记录。";
"setting_backup_last" = "上次备份是%@，占用空间 %@。";
"setting_backup_preparing" = "备份中...";
"setting_backup_preparing_progress" = "备份中...(%@)";
"setting_backup_preparing" = "准备中...";
"setting_backup_preparing_progress" = "准备中...(%@)";
"setting_backup_uploading" = "上传中...";
"setting_backup_uploading_progress" = "上传中: %@ / %@ (%@)";
"setting_restore_progress" = "正在恢复 %@";
Expand Down
Loading