From 3f5ab138b3a924e18772b26e2988f0d8862e343d Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Tue, 7 Jun 2022 15:41:57 +0200 Subject: [PATCH 1/3] Lower compile sdk version to 30 PIA-2674 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 14870f49..5f53e0a4 100644 --- a/build.gradle +++ b/build.gradle @@ -63,7 +63,7 @@ task printLibraryVersion { } ext { - compileSdkVersion = 31 + compileSdkVersion = 30 minSdkVersion = 19 targetSdkVersion = 30 versionCode = libVersionCode From b80f11a6801df124d18b9f61ffbda3ebfa35803c Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Tue, 7 Jun 2022 15:46:54 +0200 Subject: [PATCH 2/3] Lower version of dependencies to work with compile sdk version 30 PIA-2674 --- build.gradle | 2 +- ginivision-accounting-network/build.gradle | 2 +- ginivision-network/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 5f53e0a4..6e6066cf 100644 --- a/build.gradle +++ b/build.gradle @@ -72,7 +72,7 @@ ext { ext.deps = [ // Android - androidxCore : '1.7.0', + androidxCore : '1.6.0', androidxAppCompat : '1.3.1', androidxFragment : '1.3.6', androidxViewPager : '1.0.0', diff --git a/ginivision-accounting-network/build.gradle b/ginivision-accounting-network/build.gradle index 23a8b6f1..21d9947d 100644 --- a/ginivision-accounting-network/build.gradle +++ b/ginivision-accounting-network/build.gradle @@ -38,7 +38,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.annotation:annotation:$deps.androidxAnnotations" implementation project(path: ':ginivision') - api('net.gini:gini-android-sdk:2.9.2@aar') { + api('net.gini:gini-android-sdk:2.9.0@aar') { transitive = true } diff --git a/ginivision-network/build.gradle b/ginivision-network/build.gradle index f15678c8..cd3fe4e2 100644 --- a/ginivision-network/build.gradle +++ b/ginivision-network/build.gradle @@ -38,7 +38,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "androidx.annotation:annotation:$deps.androidxAnnotations" implementation project(path: ':ginivision') - api('net.gini:gini-android-sdk:2.10.0@aar') { + api('net.gini:gini-android-sdk:2.9.0@aar') { transitive = true } From 110ce906cfb41809cff78b10b9273bb617ed369e Mon Sep 17 00:00:00 2001 From: Alpar Szotyori Date: Tue, 7 Jun 2022 15:47:55 +0200 Subject: [PATCH 3/3] Remove ability to set a custom `TrustManager` as it needs a newer Gini API SDK version PIA-2674 --- .../GiniVisionDefaultNetworkService.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/ginivision-network/src/main/java/net/gini/android/vision/network/GiniVisionDefaultNetworkService.java b/ginivision-network/src/main/java/net/gini/android/vision/network/GiniVisionDefaultNetworkService.java index 550855a5..c7ff3f08 100644 --- a/ginivision-network/src/main/java/net/gini/android/vision/network/GiniVisionDefaultNetworkService.java +++ b/ginivision-network/src/main/java/net/gini/android/vision/network/GiniVisionDefaultNetworkService.java @@ -35,8 +35,6 @@ import androidx.annotation.Nullable; import androidx.annotation.XmlRes; -import javax.net.ssl.TrustManager; - import bolts.Continuation; import bolts.Task; @@ -349,7 +347,6 @@ public static class Builder { private int mMaxNumberOfRetries; private float mBackoffMultiplier; private DocumentMetadata mDocumentMetadata; - private TrustManager mTrustManager; Builder(@NonNull final Context context) { mContext = context; @@ -394,9 +391,6 @@ public GiniVisionDefaultNetworkService build() { if (mBackoffMultiplier >= 0) { sdkBuilder.setConnectionBackOffMultiplier(mBackoffMultiplier); } - if (mTrustManager != null) { - sdkBuilder.setTrustManager(mTrustManager); - } final Gini giniApi = sdkBuilder.build(); return new GiniVisionDefaultNetworkService(giniApi, mDocumentMetadata); } @@ -569,20 +563,6 @@ public Builder setDocumentMetadata(@NonNull final DocumentMetadata documentMetad return this; } - /** - * Set a custom {@link TrustManager} implementation to have full control over which certificates to trust. - *

- * Please be aware that if you set a custom TrustManager implementation here than it will override any - * network security configuration - * you may have set. - * - * @param trustManager A {@link TrustManager} implementation. - * @return the {@link Builder} instance - */ - public Builder setTrustManager(@NonNull final TrustManager trustManager) { - mTrustManager = trustManager; - return this; - } } }