Enable automatic backups only after user taps OK

This commit is contained in:
Naveen
2023-03-25 15:42:03 +05:30
parent bd56c1c86c
commit ed127ee6d2
2 changed files with 12 additions and 14 deletions

View File

@@ -847,13 +847,10 @@ class SettingsActivity : SimpleActivity() {
ManageAutomaticBackupsDialog( ManageAutomaticBackupsDialog(
activity = this, activity = this,
onSuccess = { onSuccess = {
enableOrDisableAutomaticBackups(true)
scheduleNextAutomaticBackup() scheduleNextAutomaticBackup()
},
onCancel = {
enableOrDisableAutomaticBackups(false)
} }
) )
enableOrDisableAutomaticBackups(true)
} else { } else {
cancelScheduledAutomaticBackup() cancelScheduledAutomaticBackup()
enableOrDisableAutomaticBackups(false) enableOrDisableAutomaticBackups(false)
@@ -864,9 +861,12 @@ class SettingsActivity : SimpleActivity() {
private fun setupManageAutomaticBackups() { private fun setupManageAutomaticBackups() {
settings_manage_automatic_backups_holder.beVisibleIf(isRPlus() && config.autoBackup) settings_manage_automatic_backups_holder.beVisibleIf(isRPlus() && config.autoBackup)
settings_manage_automatic_backups_holder.setOnClickListener { settings_manage_automatic_backups_holder.setOnClickListener {
ManageAutomaticBackupsDialog(this, onSuccess = { ManageAutomaticBackupsDialog(
scheduleNextAutomaticBackup() activity = this,
}) onSuccess = {
scheduleNextAutomaticBackup()
}
)
} }
} }

View File

@@ -10,7 +10,7 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import kotlinx.android.synthetic.main.dialog_manage_automatic_backups.view.* import kotlinx.android.synthetic.main.dialog_manage_automatic_backups.view.*
class ManageAutomaticBackupsDialog(private val activity: SimpleActivity, onSuccess: (() -> Unit)? = null, onCancel: (() -> Unit)? = null) { class ManageAutomaticBackupsDialog(private val activity: SimpleActivity, onSuccess: () -> Unit) {
private val view = (activity.layoutInflater.inflate(R.layout.dialog_manage_automatic_backups, null) as ViewGroup) private val view = (activity.layoutInflater.inflate(R.layout.dialog_manage_automatic_backups, null) as ViewGroup)
private val config = activity.config private val config = activity.config
private var backupFolder = config.autoBackupFolder private var backupFolder = config.autoBackupFolder
@@ -100,18 +100,16 @@ class ManageAutomaticBackupsDialog(private val activity: SimpleActivity, onSucce
} }
} }
onSuccess?.invoke() activity.runOnUiThread {
onSuccess()
}
dialog.dismiss() dialog.dismiss()
} }
} }
else -> activity.toast(R.string.invalid_name) else -> activity.toast(R.string.invalid_name)
} }
} }
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener {
onCancel?.invoke()
dialog.dismiss()
}
} }
} }
} }