diff options
author | Torsten Grote <t@grobox.de> | 2023-03-28 14:08:37 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2023-03-28 15:05:46 -0300 |
commit | 4d0fabf804e1afffd91927d9805a026e8aaad777 (patch) | |
tree | 2789741ff1840bef31ed2e5d97048c175eb11e3d /wallet/src/main/res | |
parent | 5ed3f1b65c0eb5e68da23bd597c59381d2c98441 (diff) | |
download | taler-android-4d0fabf804e1afffd91927d9805a026e8aaad777.tar.gz taler-android-4d0fabf804e1afffd91927d9805a026e8aaad777.tar.bz2 taler-android-4d0fabf804e1afffd91927d9805a026e8aaad777.zip |
[wallet] Add test option in dev mode and remove backup option
to not give false impression that there's an actual backup/
Diffstat (limited to 'wallet/src/main/res')
-rw-r--r-- | wallet/src/main/res/navigation/nav_graph.xml | 8 | ||||
-rw-r--r-- | wallet/src/main/res/values/strings.xml | 5 | ||||
-rw-r--r-- | wallet/src/main/res/xml/settings_backup.xml | 51 | ||||
-rw-r--r-- | wallet/src/main/res/xml/settings_main.xml | 14 |
4 files changed, 9 insertions, 69 deletions
diff --git a/wallet/src/main/res/navigation/nav_graph.xml b/wallet/src/main/res/navigation/nav_graph.xml index 2b9463b..6508539 100644 --- a/wallet/src/main/res/navigation/nav_graph.xml +++ b/wallet/src/main/res/navigation/nav_graph.xml @@ -106,9 +106,6 @@ <action android:id="@+id/action_nav_settings_to_nav_settings_exchanges" app:destination="@id/nav_settings_exchanges" /> - <action - android:id="@+id/action_nav_settings_to_nav_settings_backup" - app:destination="@id/nav_settings_backup" /> </fragment> <fragment @@ -168,11 +165,6 @@ </fragment> <fragment - android:id="@+id/nav_settings_backup" - android:name="net.taler.wallet.settings.BackupSettingsFragment" - android:label="@string/nav_settings_backup" /> - - <fragment android:id="@+id/nav_peer_pull" android:name="net.taler.wallet.peer.OutgoingPullFragment" android:label="@string/receive_peer_title"> diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml index c313248..67d2033 100644 --- a/wallet/src/main/res/values/strings.xml +++ b/wallet/src/main/res/values/strings.xml @@ -245,12 +245,11 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card <string name="settings_version_protocol_exchange">Supported Exchange Versions</string> <string name="settings_version_protocol_merchant">Supported Merchant Versions</string> <string name="settings_version_unknown">Unknown</string> + <string name="settings_test">Run integration test</string> + <string name="settings_test_summary">Performs test transactions with demo setup</string> <string name="settings_reset">Reset Wallet (dangerous!)</string> <string name="settings_reset_summary">Throws away your money</string> - <string name="nav_settings_backup">Backup</string> - <string name="backup_last">Last Backup: %s</string> - <string name="refund_title">Refund</string> <string name="refund_error">Error processing refund</string> <string name="refund_success">Refund received: %s</string> 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 aa9b129..0000000 --- a/wallet/src/main/res/xml/settings_backup.xml +++ /dev/null @@ -1,51 +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" /> - - </PreferenceCategory> - -</PreferenceScreen> diff --git a/wallet/src/main/res/xml/settings_main.xml b/wallet/src/main/res/xml/settings_main.xml index 101aa37..3a6d991 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" @@ -99,6 +92,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" |