[taler-taler-android] branch master updated (85a3a53 -> ea246c2)

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a change to branch master
in repository taler-android.

    from 85a3a53  [cashier] prevent crash while main fragment is on back-stack
     new 92fb7fb  Bump library versions
     new ea246c2  wallet: remove/change confusing strings

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.gradle                                   | 6 +++---
 merchant-terminal/build.gradle                 | 2 +-
 taler-kotlin-android/build.gradle              | 2 +-
 wallet/build.gradle                            | 2 +-
 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 ++--
 8 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7f12ed4..2deabf4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,9 +4,9 @@ buildscript {
     ext.nav_version = "2.3.0"
     ext.material_version = "1.2.1"
     ext.lifecycle_version = "2.2.0"
-    ext.constraintlayout_version = "2.0.1"
+    ext.constraintlayout_version = "2.0.2"
     // check https://android-rebuilds.beuc.net/ for availability of free build 
tools
-    ext.build_tools_version = "29.0.2"
+    ext.build_tools_version = "29.0.3"
     // should debug build types be minified with D8 as well?
     ext.minify_debug = false
     repositories {
@@ -14,7 +14,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath 
"androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle
index 1f803cb..318dcbd 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation "com.google.android.material:material:$material_version"
     implementation 
"androidx.constraintlayout:constraintlayout:$constraintlayout_version"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc02"
+    implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc03"
 
     // Navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
diff --git a/taler-kotlin-android/build.gradle 
b/taler-kotlin-android/build.gradle
index d06fde3..eb299fe 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     api project(":multiplatform:common")
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.1'
+    implementation 'androidx.core:core-ktx:1.3.2'
     implementation 
"androidx.constraintlayout:constraintlayout:$constraintlayout_version"
 
     // Navigation
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 48e1749..9f5d018 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -121,7 +121,7 @@ dependencies {
 
     // Lists and Selection
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc02"
+    implementation "androidx.recyclerview:recyclerview-selection:1.1.0-rc03"
 
     // Navigation Library
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.