From f7314a5cca49143ac9cd3b56bfe2e0de4ed02430 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 20 Oct 2020 13:21:49 +0300
Subject: [PATCH] Migration: improve the end-of-migration message.

---
 .../java/com/etesync/syncadapter/ui/MigrateV2Activity.kt    | 6 +++++-
 app/src/main/res/values/strings.xml                         | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/etesync/syncadapter/ui/MigrateV2Activity.kt b/app/src/main/java/com/etesync/syncadapter/ui/MigrateV2Activity.kt
index 8c0e16aa..8fe545b4 100644
--- a/app/src/main/java/com/etesync/syncadapter/ui/MigrateV2Activity.kt
+++ b/app/src/main/java/com/etesync/syncadapter/ui/MigrateV2Activity.kt
@@ -714,10 +714,14 @@ class MigrateCollectionsDoFragment(private val etebase: EtebaseAccount,
                 }
 
                 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())
                             .setIcon(R.drawable.ic_info_dark)
                             .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) { _, _ -> }
                             .setOnDismissListener {
                                 requireFragmentManager().beginTransaction()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 27989e8d..66c2f56e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,7 +97,8 @@
     <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_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 -->