rework backup & restore

use the implementation from Conversations

3 files changed, 13 insertions, 11 deletions

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index e3f355814..ecf8eccd1 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -78,7 +78,6 @@
     <attr name="icon_settings" format="reference" />
     <attr name="icon_share" format="reference" />
     <attr name="icon_delete" format="reference" />
-    <attr name="icon_import_export" format="reference" />
     <attr name="icon_scan_qr_code" format="reference" />
     <attr name="icon_enable_undecided_device" format="reference" />
     <attr name="icon_scroll_down" format="reference" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8867502a4..b0912e1c9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -314,9 +314,12 @@
     <string name="smp_requested">Contact requested SMP verification</string>
     <string name="no_otr_session_found">No valid OTR session has been found!</string>
     <string name="conversations_foreground_service" translatable="false">Pix-Art Messenger</string>
-    <string name="pref_export_logs">Export history</string>
-    <string name="pref_export_logs_summary">Write conversations history logs to SD card</string>
-    <string name="notification_export_logs_title">Writing conversations to SD card</string>
+    <string name="pref_create_backup">Create backup</string>
+    <string name="pref_create_backup_summary">Write backup files to %s</string>
+    <string name="notification_create_backup_title">Creating backup files</string>
+    <string name="notification_restore_backup_title">Restoring backup</string>
+    <string name="notification_restored_backup_title">Your backup has been restored</string>
+    <string name="notification_restored_backup_subtitle">Do not forget to enable the account.</string>
     <string name="choose_file">Choose file</string>
     <string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string>
     <string name="download_x_file">Download %s</string>
@@ -575,9 +578,7 @@
     <string name="import_canceled">Import canceled</string>
     <string name="Import_failed">Database import failed, an import is not possible</string>
     <string name="Password_wrong">Wrong password, try again</string>
-    <string name="enter_account_password">Please enter your account password to import your backup.</string>
     <string name="please_wait">Please wait…</string>
-    <string name="databaseimport_started">Backup will be imported, this may take awhile.</string>
     <string name="pref_export_plain_text_logs_summary">Enable an export of chat logs as human readable text files</string>
     <string name="pref_export_plain_text_logs">Export human readable chat logs</string>
     <string name="payment_required">Payment required</string>
@@ -823,7 +824,7 @@
     <string name="pref_more_notification_settings">Notification Settings</string>
     <string name="pref_more_notification_settings_summary">Importance, Sound, Vibrate</string>
     <string name="video_compression_channel_name">Video compression</string>
-    <string name="backup_channel_name">Database backup</string>
+    <string name="backup_channel_name"><![CDATA[Backup & Restore]]></string>
     <string name="app_update_channel_name">App update</string>
     <string name="action_group_details">Group details</string>
     <string name="view_media">View media</string>
@@ -862,4 +863,10 @@
     <string name="open_with">Open with…</string>
     <string name="choose_account">Choose account</string>
     <string name="set_profile_picture">Pix-Art Messenger profile picture</string>
+    <string name="restore_backup">Restore backup</string>
+    <string name="restore">Restore</string>
+    <string name="enter_password_to_restore">Enter your password for the account %s to restore the backup.</string>
+    <string name="restore_warning">Do not use the restore backup feature in an attempt to clone (run simultaneously) an installation. Restoring a backup is only meant for migrations or in case you have lost the original device.</string>
+    <string name="unable_to_restore_backup">Unable to restore backup</string>
+    <string name="unable_to_decrypt_backup">Unable to decrypt backup</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 92e7cd49c..8060687ac 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -99,8 +99,6 @@
         <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
         <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
         <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item>
-        <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp
-        </item>
         <item name="icon_delete" type="reference">@drawable/ic_delete_black_24dp</item>
         <item name="icon_share" type="reference">@drawable/ic_share_black_24dp</item>
         <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item>
@@ -274,8 +272,6 @@
         <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
         <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
         <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item>
-        <item name="icon_import_export" type="reference">@drawable/ic_import_export_white_24dp
-        </item>
         <item name="icon_delete" type="reference">@drawable/ic_delete_white_24dp</item>
         <item name="icon_share" type="reference">@drawable/ic_share_white_24dp</item>
         <item name="icon_scan_qr_code" type="reference">@drawable/ic_qrcode_scan_white_24dp</item>