diff --git a/app/build.gradle b/app/build.gradle index bdc8e32..e2af3a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ dependencies { // webid product-plugin //noinspection GradleDependency - def product_catalog_version = "12.0.0" + def product_catalog_version = "13.3.4" implementation ("de.webid-solutions:android_meta_plugin:$product_catalog_version") { changing = true } @@ -79,5 +79,4 @@ dependencies { implementation ("de.webid-solutions:android_eid_on_server_product_plugin:$product_catalog_version") { changing = true } - -} \ No newline at end of file +} diff --git a/app/src/main/java/de/webidsolutions/metaplugindemo/MainActivity.kt b/app/src/main/java/de/webidsolutions/metaplugindemo/MainActivity.kt index d599c70..9e42758 100644 --- a/app/src/main/java/de/webidsolutions/metaplugindemo/MainActivity.kt +++ b/app/src/main/java/de/webidsolutions/metaplugindemo/MainActivity.kt @@ -15,6 +15,8 @@ import androidx.appcompat.app.AppCompatActivity 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.metaplugindemo.tasks.EApiResult +import de.webidsolutions.metaplugindemo.tasks.MetaPluginVerifyTask import de.webidsolutions.mobile_app.sdk.WebIdMobileAppSdkException import de.webidsolutions.mobile_app.sdk.WebIdSdkEnvironment import de.webidsolutions.mobile_app.sdk.domain.VerifyActionIdResult @@ -22,9 +24,6 @@ import de.webidsolutions.mobile_app.sdk.impl.AsyncTaskResultGeneric import de.webidsolutions.pay_on_server_product_plugin.PayOnServerProductPlugin import de.webidsolutions.plugin_core.IProductPluginWebId import de.webidsolutions.video_ident.plugin.videocall.VideoOptionsConfig -import de.webidsolutions.video_ident_product_plugin.VideoIdentProductPlugin -import de.webidsolutions.metaplugindemo.tasks.EApiResult -import de.webidsolutions.metaplugindemo.tasks.MetaPluginVerifyTask import java.lang.Integer.parseInt import java.net.URI @@ -36,7 +35,7 @@ private val config = VideoOptionsConfig( ) // TODO insert your Action id -private const val actionId = "136249502" +private const val actionId = "279945707" // TODO choose your environment private val chosenEnvironment: EWebIDEnv = EWebIDEnv.TEST @@ -47,7 +46,6 @@ private val chosenEnvironment: EWebIDEnv = EWebIDEnv.TEST */ internal class MainActivity : AppCompatActivity() { - private lateinit var videoPluginCb: CheckBox private lateinit var eidOnServerPluginCb: CheckBox private lateinit var payOnServerPluginCb: CheckBox private lateinit var autoIdOnServerPluginCb: CheckBox @@ -65,7 +63,6 @@ internal class MainActivity : AppCompatActivity() { autoIdOnServerPluginCb = findViewById(R.id.cb_plugin_auto_id_on_server) payOnServerPluginCb = findViewById(R.id.cb_plugin_pay_on_server) eidOnServerPluginCb = findViewById(R.id.cb_plugin_eid_on_server) - videoPluginCb = findViewById(R.id.cb_plugin_video) startButton = findViewById(R.id.startButton) startButton.setOnClickListener { @@ -104,9 +101,9 @@ internal class MainActivity : AppCompatActivity() { username, apiKey, this.applicationContext, - selectProductPlugins + selectProductPlugins, + config ) - metaPlugin.setVideoConfig(config) MetaPluginVerifyTask(metaPlugin) .setOnPostExecuteCallback(metaPluginVerifyCallback(metaPlugin)) .execute(actionId) @@ -140,7 +137,6 @@ internal class MainActivity : AppCompatActivity() { if (autoIdOnServerPluginCb.isChecked) AutoIdentOnServerProductPlugin() else null, if (payOnServerPluginCb.isChecked) PayOnServerProductPlugin() else null, if (eidOnServerPluginCb.isChecked) EIdOnServerProductPlugin() else null, - if (videoPluginCb.isChecked) VideoIdentProductPlugin(VideoOptionsConfig()) else null ) ) } diff --git a/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/EApiResult.kt b/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/EApiResult.kt index 6719b6c..a5ef71f 100644 --- a/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/EApiResult.kt +++ b/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/EApiResult.kt @@ -99,6 +99,11 @@ enum class EApiResult(val messageKey: String, val messageID: Int, val fatal: Boo "apierror_session_expired", 0, true + ), + DUPLICATE_PLUGIN( + "init_error_duplicate_plugin", + 0, + true ); var extInfo = "" diff --git a/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/MetaPluginVerifyTask.kt b/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/MetaPluginVerifyTask.kt index 2a40547..141b259 100644 --- a/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/MetaPluginVerifyTask.kt +++ b/app/src/main/java/de/webidsolutions/metaplugindemo/tasks/MetaPluginVerifyTask.kt @@ -4,6 +4,7 @@ */ package de.webidsolutions.metaplugindemo.tasks +import de.webidsolutions.meta_plugin.DuplicationPluginsException import de.webidsolutions.meta_plugin.WebIdMetaPlugin import de.webidsolutions.mobile_app.sdk.EidIdentRequiredException import de.webidsolutions.mobile_app.sdk.IdentNotSupportedException @@ -27,6 +28,8 @@ internal class MetaPluginVerifyTask( override fun doInBackground(vararg params: String): AsyncTaskResultGeneric { val apiResult = try { return AsyncTaskResultGeneric(metaPlugin.verify(params[0]), EApiResult.SUCCESS) + } catch (e: DuplicationPluginsException) { + EApiResult.DUPLICATE_PLUGIN } catch (e: IllegalArgumentException) { e.printStackTrace() if (e.message!!.startsWith("actionId")) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d6727bd..31a4418 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -51,6 +51,8 @@ android:layout_height="wrap_content" android:layout_marginLeft="30dp" android:text="VideoId" + android:checked="true" + android:clickable="false" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cb_plugin_eid_on_server" />