arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-04-30 05:59:06 +00:00
Code Issues Releases Wiki Activity

Migration: improve the end-of-migration message.

Browse Source
This commit is contained in:
Tom Hacohen 2020-10-20 13:21:49 +03:00
parent 4ee571a4c9
commit f7314a5cca
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/etesync/syncadapter/ui/MigrateV2Activity.kt
View File

@ -714,10 +714,14 @@ class MigrateCollectionsDoFragment(private val etebase: EtebaseAccount,
} }
uiThread { uiThread {
var message = getString(R.string.migrate_v2_wizard_migrate_progress_done)
if (malformed > 0) {
message += "\n\n" + getString(R.string.migrate_v2_wizard_migrate_progress_done_malformed, malformed)
}
AlertDialog.Builder(requireContext()) AlertDialog.Builder(requireContext())
.setIcon(R.drawable.ic_info_dark) .setIcon(R.drawable.ic_info_dark)
.setTitle(R.string.migrate_v2_wizard_migrate_title) .setTitle(R.string.migrate_v2_wizard_migrate_title)
.setMessage(getString(R.string.migrate_v2_wizard_migrate_progress_done, badMtime, malformed)) .setMessage(message)
.setPositiveButton(android.R.string.yes) { _, _ -> } .setPositiveButton(android.R.string.yes) { _, _ -> }
.setOnDismissListener { .setOnDismissListener {
requireFragmentManager().beginTransaction() requireFragmentManager().beginTransaction()

3
app/src/main/res/values/strings.xml
View File

@ -97,7 +97,8 @@
<string name="migrate_v2_wizard_migrate_title">Migrating…</string> <string name="migrate_v2_wizard_migrate_title">Migrating…</string>
<string name="migrate_v2_wizard_migrate_progress">Migrating collection %d/%d</string> <string name="migrate_v2_wizard_migrate_progress">Migrating collection %d/%d</string>
<string name="migrate_v2_wizard_migrate_progress_entries">Migrated entries %d/%d</string> <string name="migrate_v2_wizard_migrate_progress_entries">Migrated entries %d/%d</string>
<string name="migrate_v2_wizard_migrate_progress_done">Done.\nModification time missing for %d entries (set to "now").\nIgnored %d malformed entries (probably safe to ignore).</string> <string name="migrate_v2_wizard_migrate_progress_done">Your account has been migrated.\nPlease verify everything was copied over correctly, and remove your old account once done.</string>
<string name="migrate_v2_wizard_migrate_progress_done_malformed">Ignored %d malformed entries (probably safe to ignore).</string>
<!-- AccountUpdateService --> <!-- AccountUpdateService -->