Add revision: v1.26.4

Governikus · Apr 28, 2023 · e6422c7 · e6422c7
1 parent ac686f3
commit e6422c7
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext.kotlin_version = '1.8.10'
-    ext.sdkwrapper_version = "1.26.3.0"
+    ext.sdkwrapper_version = "1.26.4.0"
 
     repositories {
         google()

diff --git a/libs/build.gradle b/libs/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('ausweisapp2.aar'))
diff --git a/sdkwrapper/build.gradle b/sdkwrapper/build.gradle
@@ -119,10 +119,23 @@ afterEvaluate {
     }
 }
 
+def useLocal = file("${rootDir}/libs/ausweisapp2.aar").exists();
+
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    if (useLocal) {
+        implementation project(':libs')
+        if(useLocal) {
+                println "⚠   ⚠   ⚠   ⚠   WARNING  ⚠   ⚠   ⚠   ⚠\n" +
+                "   Using local SDK might be outdated  \n" +
+                "⚠  Delete local SDK in lib folder to ⚠\n" +
+                "   use latest version!                \n" +
+                "⚠   ⚠   ⚠   ⚠   WARNING  ⚠   ⚠   ⚠   ⚠"
+        }
+    }
+    else {
+        implementation 'com.governikus:ausweisapp:1.26.4'
+    }
 
-    implementation "com.governikus:ausweisapp:1.26.3"
     implementation 'com.google.code.gson:gson:2.10.1'
 
     testImplementation "junit:junit:4.13.2"

diff --git a/...rapper/src/main/java/de/governikus/ausweisapp2/sdkwrapper/card/core/WorkflowController.kt b/...rapper/src/main/java/de/governikus/ausweisapp2/sdkwrapper/card/core/WorkflowController.kt
@@ -516,7 +516,7 @@ class WorkflowController internal constructor(private val sdkConnection: SdkConn
                         callback { onChangePinStarted() }
                     }
                     else -> {
-                        callback { onChangePinCompleted(ChangePinResult(message.success)) }
+                        callback { onChangePinCompleted(ChangePinResult(message.success, message.reason)) }
                     }
                 }
             }

diff --git a/sdkwrapper/src/main/java/de/governikus/ausweisapp2/sdkwrapper/card/core/WorkflowData.kt b/sdkwrapper/src/main/java/de/governikus/ausweisapp2/sdkwrapper/card/core/WorkflowData.kt
@@ -148,12 +148,14 @@ data class AuthResult(
 /**
  * Final result of a PIN change.
  *
- * @property success True if a the PIN has been successfully set, else false
+ * @property success True if a the PIN has been successfully set, else false.
+ * @property reason Unique error code if the PIN change failed.
  */
 
 @Parcelize
 data class ChangePinResult(
-    val success: Boolean
+    val success: Boolean,
+    val reason: String?
 ) : Parcelable
 
 /**

diff --git a/.../main/java/de/governikus/ausweisapp2/sdkwrapper/card/core/ausweisapp2/AA2SdkConnection.kt b/.../main/java/de/governikus/ausweisapp2/sdkwrapper/card/core/ausweisapp2/AA2SdkConnection.kt
@@ -106,7 +106,6 @@ internal class AA2SdkConnection : WorkflowController.SdkConnection {
 
         return try {
             val messageJson = gson.toJson(command)
-            Log.d(TAG, "Send message: $messageJson")
             sdk.send(sessionId, messageJson)
         } catch (e: RemoteException) {
             Log.d(TAG, "Could not send command", e)

diff --git a/...oneos/card/core/WorkflowControllerTest.kt → ...apper/card/core/WorkflowControllerTest.kt b/...oneos/card/core/WorkflowControllerTest.kt → ...apper/card/core/WorkflowControllerTest.kt
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':tester', ':sdkwrapper'
+include ':tester', ':sdkwrapper', ':libs'
diff --git a/third_party_licenses/LICENSES.md b/third_party_licenses/LICENSES.md
@@ -7,4 +7,4 @@ com.google.code.gson:gson:2.10.1
 OPEN-SOURCE-LIZENZ FÜR DIE EUROPÄISCHE UNION - EUPL.md
 ======================================================
 
-com.governikus:ausweisapp:1.26.3
+com.governikus:ausweisapp:1.26.4