[taler-taler-android] branch master updated (58a3e45 -> 415dd4a)

[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 58a3e45  Fix wallet build by upgrading Kotlin/compose
     new 08213e4  Allow cleartext traffic to int.taler.net for debug builds
     new 41b75e3  [cashier] use error bottom sheet for config errors
     new 415dd4a  Remove multi-platform module as this doesn't seem to be 
desired anymore

The 3 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:
 .idea/gradle.xml                                            |  1 +
 cashier/src/debug/res/xml/network_security_config.xml       |  6 ++++++
 cashier/src/main/AndroidManifest.xml                        |  2 +-
 .../main/java/net/taler/cashier/config/ConfigFragment.kt    | 13 +++++++------
 cashier/src/main/res/values/strings.xml                     |  2 +-
 cashier/src/main/res/xml/network_security_config.xml        |  2 ++
 settings.gradle                                             |  1 -
 7 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 cashier/src/debug/res/xml/network_security_config.xml
 create mode 100644 cashier/src/main/res/xml/network_security_config.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index caf1ba4..4cc0060 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -21,6 +21,7 @@
             <option value="$PROJECT_DIR$/wallet" />
           </set>
         </option>
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/cashier/src/debug/res/xml/network_security_config.xml 
b/cashier/src/debug/res/xml/network_security_config.xml
new file mode 100644
index 0000000..a85875e
--- /dev/null
+++ b/cashier/src/debug/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">int.taler.net</domain>
+    </domain-config>
+</network-security-config>
diff --git a/cashier/src/main/AndroidManifest.xml 
b/cashier/src/main/AndroidManifest.xml
index 36a3b72..2947e83 100644
--- a/cashier/src/main/AndroidManifest.xml
+++ b/cashier/src/main/AndroidManifest.xml
@@ -11,10 +11,10 @@
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning">
 
         <activity
diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt 
b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
index a595a7f..2c0b447 100644
--- a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
@@ -37,6 +37,7 @@ import net.taler.cashier.MainViewModel
 import net.taler.cashier.R
 import net.taler.cashier.databinding.FragmentConfigBinding
 import net.taler.common.exhaustive
+import net.taler.common.showError
 
 // NOTE: HTTP should eventually be disabled.
 private const val URL_BANK_TEST = 
"https://int.taler.net/sandbox/demobanks/default";
@@ -45,15 +46,15 @@ private const val URL_BANK_TEST_REGISTER = 
"$URL_BANK_TEST/accounts/register"
 class ConfigFragment : Fragment() {
 
     private val viewModel: MainViewModel by activityViewModels()
-    private val configManager by lazy { viewModel.configManager}
+    private val configManager by lazy { viewModel.configManager }
 
     private lateinit var ui: FragmentConfigBinding
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+        savedInstanceState: Bundle?,
+    ): View {
         ui = FragmentConfigBinding.inflate(inflater, container, false)
         return ui.root
     }
@@ -118,7 +119,8 @@ class ConfigFragment : Fragment() {
 
     private fun checkConfig(config: Config): Boolean {
         if (!config.bankUrl.startsWith("https://";) &&
-            !config.bankUrl.startsWith("http://";)) {
+            !config.bankUrl.startsWith("http://";)
+        ) {
             ui.urlView.error = getString(R.string.config_bank_url_error)
             ui.urlView.requestFocus()
             return false
@@ -146,8 +148,7 @@ class ConfigFragment : Fragment() {
                 if (result.authError) {
                     Snackbar.make(requireView(), R.string.config_error_auth, 
LENGTH_LONG).show()
                 } else {
-                    val str = getString(R.string.config_error, result.msg)
-                    Snackbar.make(requireView(), str, LENGTH_LONG).show()
+                    
requireActivity().showError(getString(R.string.config_error), result.msg)
                 }
             }
         }.exhaustive
diff --git a/cashier/src/main/res/values/strings.xml 
b/cashier/src/main/res/values/strings.xml
index 4c000d8..bcaab74 100644
--- a/cashier/src/main/res/values/strings.xml
+++ b/cashier/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
     <string name="config_button_save">Save</string>
     <string name="config_bank_url_error">The address is invalid.</string>
     <string name="config_username_error">Please enter your username!</string>
-    <string name="config_error">Error retrieving configuration: %s</string>
+    <string name="config_error">Error retrieving configuration</string>
     <string name="config_error_auth">Invalid username or password!</string>
     <string name="config_error_offline" 
translatable="false">@string/balance_offline</string>
     <string name="config_demo_hint">For testing, you can <![CDATA[<a 
href="%s">create a test account at the demo bank</a>]]>.</string>
diff --git a/cashier/src/main/res/xml/network_security_config.xml 
b/cashier/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..81cd5ce
--- /dev/null
+++ b/cashier/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config />
diff --git a/settings.gradle b/settings.gradle
index 016a7ea..7b2378a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,3 @@
-include ':multiplatform:common'
 include ':cashier', ':merchant-terminal', ':wallet'
 include ':taler-kotlin-android'
 include ':merchant-lib'

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