JAV-323 Support company ID attributes (#337)

* Add company ID attribute types * Update Android build platform to 29 So it matches the one in concordium-base wallet lib. * Update version 7.2.0-SNAPSHOT * Gitignore Idea folder * Update concordium-base to 38cf687
Concordium · Aug 1, 2024 · f4e37e0 · f4e37e0
1 parent 0ac11b7
commit f4e37e0
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -94,7 +94,7 @@ jobs:
       run: |
           ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \
           --sdk_root=$ANDROID_SDK_ROOT \
-          "platform-tools" "platforms;android-27" "build-tools;27.0.3"
+          "platform-tools" "platforms;android-29" "build-tools;29.0.2"
     - name: Checkout
       uses: actions/checkout@v2
       with:
@@ -114,4 +114,4 @@ jobs:
     - name: Initialize root project
       run: mvn install -N
     - name: Build android sdk
-      run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install
+      run: cd concordium-android-sdk && mvn --batch-mode --update-snapshots install
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -94,7 +94,7 @@ jobs:
       run: |
           ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \
           --sdk_root=$ANDROID_SDK_ROOT \
-          "platform-tools" "platforms;android-27" "build-tools;27.0.3"
+          "platform-tools" "platforms;android-29" "build-tools;29.0.2"
     # Setup rust
     - name: Setup Rust
       uses: actions-rs/toolchain@v1
@@ -130,7 +130,7 @@ jobs:
       run: |
           ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager \
           --sdk_root=$ANDROID_SDK_ROOT \
-          "platform-tools" "platforms;android-27" "build-tools;27.0.3"
+          "platform-tools" "platforms;android-29" "build-tools;29.0.2"
     - name: Setup JDK 8
       uses: actions/setup-java@v4
       with:

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 *.iml
 .flattened-pom.xml
 pom.xml.versionsBackup
+.idea/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Unreleased
 - Added `MessageSigningDigest` class to generate digests for message signing
+- Added support for company identity attributes
 
 ## 7.1.0
 - Removed unnecessary  `amount` parameter from `InvokeInstanceRequest`.

diff --git a/concordium-android-sdk/pom.xml b/concordium-android-sdk/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.concordium.sdk</groupId>
         <artifactId>concordium-sdk-base</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>concordium-android-sdk</artifactId>
@@ -265,7 +265,7 @@
                         <debuggable>true</debuggable>
                     </manifest>
                     <sdk>
-                        <platform>27</platform>
+                        <platform>29</platform>
                     </sdk>
                     <nativeLibrariesDirectory>${project.basedir}/native</nativeLibrariesDirectory>
                 </configuration>

diff --git a/concordium-base b/concordium-base
diff --git a/concordium-sdk-examples/pom.xml b/concordium-sdk-examples/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.concordium.sdk</groupId>
             <artifactId>concordium-sdk</artifactId>
-            <version>7.1.0-SNAPSHOT</version>
+            <version>7.2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/concordium-sdk/pom.xml b/concordium-sdk/pom.xml
@@ -7,7 +7,7 @@
     <parent>
     <groupId>com.concordium.sdk</groupId>
         <artifactId>concordium-sdk-base</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
+        <version>7.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>com.concordium.sdk</groupId>

diff --git a/...-sdk/src/main/java/com/concordium/sdk/responses/accountinfo/credential/AttributeType.java b/...-sdk/src/main/java/com/concordium/sdk/responses/accountinfo/credential/AttributeType.java
@@ -39,7 +39,16 @@ public enum AttributeType {
     @JsonProperty("taxIdNo")
     TAX_ID_NO,
     @JsonProperty("lei")
-    LEI;
+    LEI,
+    @JsonProperty("legalName")
+    LEGAL_NAME,
+    @JsonProperty("legalCountry")
+    LEGAL_COUNTRY,
+    @JsonProperty("businessNumber")
+    BUSINESS_NUMBER,
+    @JsonProperty("registrationAuth")
+    REGISTRATION_AUTH,
+    ;
 
     public static AttributeType fromJSON(String jsonStr) throws JsonMappingException, JsonProcessingException {
         return JsonMapper.INSTANCE.readValue(String.format("\"%s\"", jsonStr), AttributeType.class);

diff --git a/crypto-jni/Cargo.lock b/crypto-jni/Cargo.lock
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.concordium.sdk</groupId>
     <artifactId>concordium-sdk-base</artifactId>
-    <version>7.1.0-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <url>https://github.com/Concordium/concordium-java-sdk</url>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     *.iml
     .flattened-pom.xml
     pom.xml.versionsBackup
+    .idea/