3 files changed, 30 insertions, 66 deletions
diff --git a/wallet/src/main/res/xml/network_security_config.xml b/wallet/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..de61259
--- /dev/null
+++ b/wallet/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">localhost</domain>
+    </domain-config>
+</network-security-config>
diff --git a/wallet/src/main/res/xml/settings_backup.xml b/wallet/src/main/res/xml/settings_backup.xml
deleted file mode 100644
index f8c5839..0000000
--- a/wallet/src/main/res/xml/settings_backup.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ This file is part of GNU Taler
-  ~ (C) 2020 Taler Systems S.A.
-  ~
-  ~ GNU Taler is free software; you can redistribute it and/or modify it under the
-  ~ terms of the GNU General Public License as published by the Free Software
-  ~ Foundation; either version 3, or (at your option) any later version.
-  ~
-  ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  ~ A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along with
-  ~ GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-  -->
-
-<PreferenceScreen
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <SwitchPreferenceCompat
-        app:defaultValue="@bool/settings_backup_default"
-        app:fragment="net.taler.wallet.settings.BackupSettingsFragment"
-        app:icon="@drawable/ic_baseline_backup"
-        app:key="pref_backup_switch"
-        app:summaryOff="Backup is disabled"
-        app:summaryOn="Backup is enabled"
-        app:title="Backup my wallet" />
-
-    <Preference
-        app:dependency="pref_backup_switch"
-        app:icon="@drawable/ic_baseline_account_tree"
-        app:key="pref_backup_services"
-        app:selectable="false"
-        app:summary="1 backup service set up"
-        app:title="Backup services" />
-
-    <PreferenceCategory
-        app:iconSpaceReserved="false"
-        app:summary="At least one of these is required to restore from backup"
-        app:title="Recovery Options">
-
-        <Preference
-            app:dependency="pref_backup_switch"
-            app:icon="@drawable/ic_baseline_vpn_key"
-            app:key="pref_backup_secret"
-            app:selectable="false"
-            app:title="Show backup secret" />
-
-        <Preference
-            app:dependency="pref_backup_switch"
-            app:icon="@drawable/ic_baseline_cloud_circle"
-            app:key="pref_backup_recovery"
-            app:summary="Not used"
-            app:title="Secure cloud recovery"/>
-
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/wallet/src/main/res/xml/settings_main.xml b/wallet/src/main/res/xml/settings_main.xml
index a713838..3567e49 100644
--- a/wallet/src/main/res/xml/settings_main.xml
+++ b/wallet/src/main/res/xml/settings_main.xml
@@ -24,13 +24,6 @@
         app:summary="@string/exchange_settings_summary"
         app:title="@string/exchange_settings_title" />
 
-    <Preference
-        app:fragment="net.taler.wallet.settings.BackupSettingsFragment"
-        app:icon="@drawable/ic_baseline_backup"
-        app:isPreferenceVisible="false"
-        app:key="pref_backup"
-        app:title="Backup"
-        tools:isPreferenceVisible="true" />
 
     <SwitchPreferenceCompat
         app:icon="@drawable/ic_developer_mode"
@@ -55,8 +48,24 @@
         tools:isPreferenceVisible="true" />
 
     <Preference
-        app:icon="@drawable/ic_account_balance_wallet"
+        app:icon="@drawable/ic_unarchive"
+        app:isPreferenceVisible="false"
+        app:key="pref_export_db"
+        app:summary="@string/settings_db_export_summary"
+        app:title="@string/settings_db_export"
+        tools:isPreferenceVisible="true" />
+
+    <Preference
+        app:icon="@drawable/ic_archive"
         app:isPreferenceVisible="false"
+        app:key="pref_import_db"
+        app:summary="@string/settings_db_import_summary"
+        app:title="@string/settings_db_import"
+        tools:isPreferenceVisible="true" />
+
+    <Preference
+        app:icon="@drawable/ic_account_balance_wallet"
+        app:isPreferenceVisible="true"
         app:key="pref_version_app"
         app:selectable="false"
         app:summary="@string/settings_version_unknown"
@@ -91,6 +100,13 @@
         tools:isPreferenceVisible="true" />
 
     <Preference
+        app:isPreferenceVisible="false"
+        app:key="pref_test"
+        app:summary="@string/settings_test_summary"
+        app:title="@string/settings_test"
+        tools:isPreferenceVisible="true" />
+
+    <Preference
         app:icon="@drawable/ic_nuke"
         app:isPreferenceVisible="false"
         app:key="pref_reset"