diff --git a/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt b/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt index 84f048b2f..bed3b2157 100644 --- a/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt +++ b/app/src/androidTest/kotlin/ee/ria/DigiDoc/domain/preferences/DataStoreTest.kt @@ -561,7 +561,7 @@ class DataStoreTest { fun dataStore_getLibdigidocppVersion_success() { val result = dataStore.getLibdigidocppVersion() - assertEquals("4.3.0.40", result) + assertEquals("4.5.0.51", result) } @Test diff --git a/libdigidoc-lib/libs/libdigidocpp.jar b/libdigidoc-lib/libs/libdigidocpp.jar index a4771f02e..f4c8e4f3e 100644 Binary files a/libdigidoc-lib/libs/libdigidocpp.jar and b/libdigidoc-lib/libs/libdigidocpp.jar differ diff --git a/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt b/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt index dc557510a..f9f8e7942 100644 --- a/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt +++ b/libdigidoc-lib/src/androidTest/kotlin/ee/ria/DigiDoc/libdigidoclib/init/InitializationTest.kt @@ -118,7 +118,8 @@ class InitializationTest { @Test fun initialization_init_success() { try { - `when`(configurationRepository.getConfiguration()).thenReturn(configurationProvider) + val configuration = configurationProvider.copy(tslUrl = "https://tsl.example.abc") + `when`(configurationRepository.getConfiguration()).thenReturn(configuration) runTest { initialization.init(context) } @@ -159,6 +160,8 @@ class InitializationTest { @Test fun initialization_init_throwsAlreadyInitializedExceptionWhenInitTwice() { + `when`(configurationRepository.getConfiguration()) + .thenReturn(configurationProvider.copy(tslUrl = "https://tsl.example.abc")) assertThrows(AlreadyInitializedException::class.java) { runTest { initialization.init(context) diff --git a/libdigidoc-lib/src/debug/jniLibs/arm64-v8a/libdigidoc_java.so b/libdigidoc-lib/src/debug/jniLibs/arm64-v8a/libdigidoc_java.so index a3cfbc1ba..5abb46e50 100644 Binary files a/libdigidoc-lib/src/debug/jniLibs/arm64-v8a/libdigidoc_java.so and b/libdigidoc-lib/src/debug/jniLibs/arm64-v8a/libdigidoc_java.so differ diff --git a/libdigidoc-lib/src/debug/jniLibs/armeabi-v7a/libdigidoc_java.so b/libdigidoc-lib/src/debug/jniLibs/armeabi-v7a/libdigidoc_java.so index 5a7d455df..74e6bf119 100644 Binary files a/libdigidoc-lib/src/debug/jniLibs/armeabi-v7a/libdigidoc_java.so and b/libdigidoc-lib/src/debug/jniLibs/armeabi-v7a/libdigidoc_java.so differ diff --git a/libdigidoc-lib/src/debug/jniLibs/x86_64/libdigidoc_java.so b/libdigidoc-lib/src/debug/jniLibs/x86_64/libdigidoc_java.so index e30e23bd3..f65480b4e 100644 Binary files a/libdigidoc-lib/src/debug/jniLibs/x86_64/libdigidoc_java.so and b/libdigidoc-lib/src/debug/jniLibs/x86_64/libdigidoc_java.so differ diff --git a/libdigidoc-lib/src/main/jniLibs/arm64-v8a/libdigidoc_java.so b/libdigidoc-lib/src/main/jniLibs/arm64-v8a/libdigidoc_java.so index a3cfbc1ba..5abb46e50 100644 Binary files a/libdigidoc-lib/src/main/jniLibs/arm64-v8a/libdigidoc_java.so and b/libdigidoc-lib/src/main/jniLibs/arm64-v8a/libdigidoc_java.so differ diff --git a/libdigidoc-lib/src/main/jniLibs/armeabi-v7a/libdigidoc_java.so b/libdigidoc-lib/src/main/jniLibs/armeabi-v7a/libdigidoc_java.so index 5a7d455df..74e6bf119 100644 Binary files a/libdigidoc-lib/src/main/jniLibs/armeabi-v7a/libdigidoc_java.so and b/libdigidoc-lib/src/main/jniLibs/armeabi-v7a/libdigidoc_java.so differ diff --git a/libdigidoc-lib/src/main/jniLibs/x86_64/libdigidoc_java.so b/libdigidoc-lib/src/main/jniLibs/x86_64/libdigidoc_java.so index e30e23bd3..f65480b4e 100644 Binary files a/libdigidoc-lib/src/main/jniLibs/x86_64/libdigidoc_java.so and b/libdigidoc-lib/src/main/jniLibs/x86_64/libdigidoc_java.so differ diff --git a/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt b/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt index d1b645168..306d6e20f 100644 --- a/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt +++ b/libdigidoc-lib/src/main/kotlin/ee/ria/DigiDoc/libdigidoclib/init/Initialization.kt @@ -128,7 +128,15 @@ class Initialization context, isLoggingEnabled, ) - digidoc.initializeLib(UserAgentUtil.getUserAgent(context), path) + + try { + digidoc.initializeLib(UserAgentUtil.getUserAgent(context), path, "") + } catch (e: RuntimeException) { + errorLog(libdigidocInitLogTag, "Unable to initialize TSL: ${e.message}", e) + } catch (e: Exception) { + errorLog(libdigidocInitLogTag, "Unable to initialize Libdigidocpp: ${e.message}", e) + throw e + } isInitialized = true } diff --git a/libdigidoc-lib/src/main/res/raw/schema.zip b/libdigidoc-lib/src/main/res/raw/schema.zip index 1df7b7fc2..09b25b9b1 100644 Binary files a/libdigidoc-lib/src/main/res/raw/schema.zip and b/libdigidoc-lib/src/main/res/raw/schema.zip differ