From 3f77f4b9a890f83c3b2ecf13ac9c9b27a7bb39a3 Mon Sep 17 00:00:00 2001 From: andre Date: Mon, 23 Feb 2026 08:54:44 +0100 Subject: [PATCH] [MWA-5506] Update Pcat Dependency to 22.02 {update dependency to 22.0.4} --- android/build.gradle | 15 +++++---- android/settings.gradle | 2 +- .../webidmetaplugin/WebIdMetaPluginModule.kt | 31 ++++++------------- example/android/settings.gradle | 2 +- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 54e7723..56537e2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -70,26 +70,25 @@ dependencies { //noinspection GradleDynamicVersion implementation "com.google.code.gson:gson:2.10.1" + implementation('de.webid-solutions:android_document_scanner:21.1.0') + implementation("com.facebook.react:react-android") - def product_catalog_version = "15.3.0" + def product_catalog_version = "22.0.4" implementation ("de.webid-solutions:android_meta_plugin:$product_catalog_version") { changing = true } - implementation ("de.webid-solutions:android_auto_ident_on_server_product_plugin:$product_catalog_version") { + implementation ("de.webid-solutions:android_autoid_product_plugin:$product_catalog_version") { changing = true } - - implementation ("de.webid-solutions:android_pay_on_server_product_plugin:$product_catalog_version") { + implementation ("de.webid-solutions:android_accountid_product_plugin:$product_catalog_version") { changing = true } - - implementation ("de.webid-solutions:android_video_ident_product_plugin:$product_catalog_version") { + implementation ("de.webid-solutions:android_videoid_product_plugin:$product_catalog_version") { changing = true } - - implementation ("de.webid-solutions:android_eid_on_server_product_plugin:$product_catalog_version") { + implementation ("de.webid-solutions:android_eid_product_plugin:$product_catalog_version") { changing = true } } diff --git a/android/settings.gradle b/android/settings.gradle index 20fbcc9..7f8d8a5 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -5,7 +5,7 @@ dependencyResolutionManagement { mavenCentral() maven { - url 'https://api.webid-solutions.de/releases/android/maven/repository/internal' + url "https://api.webid-solutions.de/releases/android/maven2/releases" } } } diff --git a/android/src/main/java/com/webidmetaplugin/WebIdMetaPluginModule.kt b/android/src/main/java/com/webidmetaplugin/WebIdMetaPluginModule.kt index e818a76..1ad85db 100644 --- a/android/src/main/java/com/webidmetaplugin/WebIdMetaPluginModule.kt +++ b/android/src/main/java/com/webidmetaplugin/WebIdMetaPluginModule.kt @@ -11,19 +11,19 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule import com.facebook.react.bridge.ReactMethod import com.facebook.react.bridge.ReadableArray import com.facebook.react.modules.core.DeviceEventManagerModule -import de.webidsolutions.auto_ident_on_server_product_plugin.AutoIdentOnServerProductPlugin -import de.webidsolutions.eid_on_server_product_plugin.EIdOnServerProductPlugin import de.webidsolutions.meta_plugin.WebIdMetaPlugin import de.webidsolutions.mobile_app.sdk.WebIdSdkEnvironment -import de.webidsolutions.pay_on_server_product_plugin.PayOnServerProductPlugin import de.webidsolutions.plugin_core.IEPluginError import de.webidsolutions.plugin_core.IProductPluginWebId import de.webidsolutions.video_ident.plugin.videocall.VideoOptionsConfig -import de.webidsolutions.video_ident_product_plugin.VideoIdentProductPlugin import java.net.URI import com.facebook.react.bridge.UiThreadUtil import android.util.Log import com.google.gson.Gson +import de.webidsolutions.video_ident_product_plugin.VideoIdProductPlugin +import de.webidsolutions.auto_ident_product_plugin.AutoIdProductPlugin +import de.webidsolutions.pay_ident_product_plugin.AccountIdProductPlugin +import de.webidsolutions.eid_product_plugin.EIdProductPlugin import java.io.ByteArrayInputStream import java.security.MessageDigest import java.security.cert.CertificateFactory @@ -63,16 +63,7 @@ class WebIdMetaPluginModule( if (input.startsWith("sha256/") || input.startsWith("sha1/")) return input - val justValue = - if (input.contains("=")) { - val left = input.substringBefore("=").trim() - val right = input.substringAfter("=").trim() - - val looksLikeEnvKey = left.isNotEmpty() && left.length <= 64 && left.all { it.isLetterOrDigit() || it == '_' } - if (looksLikeEnvKey) right else input - } else { - input - } + val justValue = input.substringAfter("=", input).trim() val base64Cert = justValue .replace("-----BEGIN CERTIFICATE-----", "") @@ -81,8 +72,6 @@ class WebIdMetaPluginModule( require(base64Cert.isNotEmpty()) { "Certificate input is empty after normalization" } - Log.d("WebIdMetaPlugin", "Base64 certificate: $base64Cert") - val certBytes = try { Base64.decode(base64Cert, Base64.DEFAULT) } catch (e: IllegalArgumentException) { @@ -145,10 +134,10 @@ class WebIdMetaPluginModule( pluginsList.forEach { p -> when (p) { - "AutoIdOnServer" -> selectedPlugins.add(AutoIdentOnServerProductPlugin()) - "PayOnServer" -> selectedPlugins.add(PayOnServerProductPlugin()) - "VideoId" -> selectedPlugins.add(VideoIdentProductPlugin(VideoOptionsConfig())) - "EIdOnServer" -> selectedPlugins.add(EIdOnServerProductPlugin()) + "AutoIdOnServer" -> selectedPlugins.add(AutoIdProductPlugin()) + "PayOnServer" -> selectedPlugins.add(AccountIdProductPlugin()) + "VideoId" -> selectedPlugins.add(VideoIdProductPlugin(VideoOptionsConfig())) + "EIdOnServer" -> selectedPlugins.add(EIdProductPlugin()) else -> Log.w(TAG, "createMetaPlugin unknown plugin string='$p'") } } @@ -233,7 +222,7 @@ class WebIdMetaPluginModule( plugin.startPlugin( activity, fragment.launcher, - customTheme + null, null ) promise.resolve("PluginStarted") diff --git a/example/android/settings.gradle b/example/android/settings.gradle index cbd36e6..4b58a1f 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -30,7 +30,7 @@ dependencyResolutionManagement { mavenCentral() maven { - url 'https://api.webid-solutions.de/releases/android/maven/repository/internal' + url "https://api.webid-solutions.de/releases/android/maven2/releases" } } }