From ea246c2e883be01302765d4eaa0c466c629aaf2a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 4 Jan 2021 09:25:08 -0300
Subject: wallet: remove/change confusing strings

---
 wallet/src/main/res/layout/nav_header_main.xml | 1 -
 wallet/src/main/res/values-fr/strings.xml      | 1 -
 wallet/src/main/res/values/strings.xml         | 4 +---
 wallet/src/main/res/xml/apduservice.xml        | 4 ++--
 4 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'wallet/src')

diff --git a/wallet/src/main/res/layout/nav_header_main.xml b/wallet/src/main/res/layout/nav_header_main.xml
index 6ae6419..e70e80f 100644
--- a/wallet/src/main/res/layout/nav_header_main.xml
+++ b/wallet/src/main/res/layout/nav_header_main.xml
@@ -27,7 +27,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
-        android:contentDescription="@string/nav_header_desc"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@mipmap/ic_launcher_round" />
diff --git a/wallet/src/main/res/values-fr/strings.xml b/wallet/src/main/res/values-fr/strings.xml
index e13a912..fecad57 100644
--- a/wallet/src/main/res/values-fr/strings.xml
+++ b/wallet/src/main/res/values-fr/strings.xml
@@ -43,7 +43,6 @@
     <string name="amount_negative">- %s</string>
     <string name="nav_header_title">GNU Taler</string>
     <string name="nav_header_subtitle">Portefeuille</string>
-    <string name="nav_header_desc">En-tête de navigation</string>
     <string name="nav_prompt_withdraw">Retirer de l\'argent électronique</string>
     <string name="nav_exchange_tos">Conditions générale d\'utilisation du change</string>
     <string name="nav_error">Erreur</string>
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
index 2fad06a..5c27eb4 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -35,7 +35,6 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
 
     <string name="nav_header_title">GNU Taler</string>
     <string name="nav_header_subtitle">Wallet</string>
-    <string name="nav_header_desc">Navigation header</string>
 
     <string name="nav_prompt_withdraw">Withdraw Digital Cash</string>
     <string name="nav_exchange_tos">Exchange\'s Terms of Service</string>
@@ -61,8 +60,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
     <string name="menu_settings">Settings</string>
     <string name="menu_retry_pending_operations">Retry Pending Operations</string>
 
-    <string name="servicedesc">my service</string>
-    <string name="aiddescription">my aid</string>
+    <string name="host_apdu_service_desc">Taler NFC Payments</string>
 
     <string name="balances_title">Balances</string>
     <string name="amount_positive">+ %s</string>
diff --git a/wallet/src/main/res/xml/apduservice.xml b/wallet/src/main/res/xml/apduservice.xml
index 52877d6..448a521 100644
--- a/wallet/src/main/res/xml/apduservice.xml
+++ b/wallet/src/main/res/xml/apduservice.xml
@@ -15,11 +15,11 @@
   -->
 
 <host-apdu-service xmlns:android="http://schemas.android.com/apk/res/android"
-    android:description="@string/servicedesc"
+    android:description="@string/host_apdu_service_desc"
     android:requireDeviceUnlock="true">
     <aid-group
         android:category="other"
-        android:description="@string/aiddescription">
+        android:description="@string/host_apdu_service_desc">
         <aid-filter android:name="F00054414C4552" />
     </aid-group>
 </host-apdu-service>
\ No newline at end of file
-- 
cgit v1.2.3