Merge branch 'ipc-health-sdk-update' into IPC-108-payment-component-w…

…ith-pay-invoice-button

.github/workflows/bank-sdk.check.yml

@@ -132,33 +132,37 @@ jobs:
           java-version: '17'
           cache: 'gradle'
 
-      - name: build debug screen api example app
+      - name: build release example app for QA
         run: >
-          ./gradlew bank-sdk:example-app:assembleDebug
+          ./gradlew bank-sdk:example-app:assembleQaRelease
           -PclientId="gini-mobile-test" 
           -PclientSecret="${{ secrets.GINI_MOBILE_TEST_CLIENT_SECRET }}"
+          -PreleaseKeystoreFile="screen_api_example.jks"
+          -PreleaseKeystorePassword='${{ secrets.BANK_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
+          -PreleaseKeyAlias="screen_api_example"
+          -PreleaseKeyPassword='${{ secrets.BANK_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
 
-      - name: archive debug screen api example app
+      - name: archive release example app for QA
         uses: actions/upload-artifact@v3
         with:
-          name: bank-sdk-example-app-debug
-          path: bank-sdk/example-app/build/outputs/apk/debug
+          name: bank-sdk-example-app-qa-release
+          path: bank-sdk/example-app/build/outputs/apk/qa/release
 
-      - name: build release screen api example app
+      - name: build release example app for production
         run: >
-          ./gradlew bank-sdk:example-app:assembleRelease
+          ./gradlew bank-sdk:example-app:assembleProdRelease
           -PclientId="gini-mobile-test" 
           -PclientSecret="${{ secrets.GINI_MOBILE_TEST_CLIENT_SECRET }}"
           -PreleaseKeystoreFile="screen_api_example.jks"
           -PreleaseKeystorePassword='${{ secrets.BANK_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
           -PreleaseKeyAlias="screen_api_example"
           -PreleaseKeyPassword='${{ secrets.BANK_SDK_EXAMPLE_APP_KEYSTORE_PASSWORD }}'
 
-      - name: archive release screen api example app
+      - name: archive release example app for production
         uses: actions/upload-artifact@v3
         with:
-          name: bank-sdk-example-app-release
-          path: bank-sdk/example-app/build/outputs/apk/release
+          name: bank-sdk-example-app-prod-release
+          path: bank-sdk/example-app/build/outputs/apk/prod/release
 
   android-lint:
     runs-on: ubuntu-latest

RELEASE.md

@@ -6,12 +6,12 @@
 
 # How to release
 To publish releases follow these steps:
-1. Create releases in Jira in PIA's project: https://ginis.atlassian.net/projects/PIA?selectedItem=com.atlassian.jira.jira-projects-plugin%3Arelease-page
+1. For Capture SDK, Bank SDK and Bank API Library create releases in Jira in Photopayment's [project](https://ginis.atlassian.net/projects/PP?orderField=RANK&selectedItem=com.atlassian.jira.jira-projects-plugin:release-page&status=released-unreleased) and for Health SDK and Health API Library in the Insurance's [project](https://ginis.atlassian.net/projects/IPC?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page). 
    1. Connect tickets to each release: for each to-be-released ticket add the release to its "Fix versions" field.
    2. Add release notes in markdown format to each release's description (you can copy and update the release notes of a previous release).  
       Markdown formatting is needed because these release notes will be published on GitHub's [releases page](https://github.com/gini/gini-mobile-android/releases).
 2. Read this
-   [wiki](https://ginis.atlassian.net/wiki/spaces/BANKING/pages/17236285/Support+multiple+Android+SDK+and+library+versions+parallely)
+   [wiki](https://ginis.atlassian.net/wiki/spaces/PLMO/pages/83787798/Support+multiple+Android+SDK+and+library+versions+parallely)
    page to determine which branch to use because we support three main version (1.x.x, 2.x.x and 3.x.x).
 3. Check out or create the required branch and bump the version numbers:
    1. Bump the version in each to-be-released module's:

bank-sdk/example-app/README.md

@@ -25,4 +25,11 @@ $ ./gradlew bank-sdk:example-app:assembleRelease \
     -PclientId=<Gini API client id> \
     -PclientSecret=<Gini API client secret>
 ``` 
-
+
+Flavors
+=======
+
+The example app has three flavors: `dev`, `prod` and `qa`. The `dev` flavor is used by default. The `prod` flavor
+is used for creating release builds which can be shared with clients while the `qa` flavor is used for creating release builds
+for QA purposes. The difference between `prod` and `qa` is that `qa` allows using custom SSL root certificates for
+SSL proxies (e.g. Charles Proxy).

bank-sdk/example-app/build.gradle.kts

@@ -76,6 +76,19 @@ android {
             resValue("string", "gini_api_client_secret", credentials["clientSecret"] ?: "")
         }
     }
+    flavorDimensions += "environment"
+    productFlavors {
+        create("prod") {
+            dimension = "environment"
+        }
+        create("dev") {
+            isDefault = true
+            dimension = "environment"
+        }
+        create("qa") {
+            dimension = "environment"
+        }
+    }
     compileOptions {
         sourceCompatibility(JavaVersion.VERSION_1_8)
         targetCompatibility(JavaVersion.VERSION_1_8)

bank-sdk/example-app/src/debug/res/xml/network_security_config.xml → bank-sdk/example-app/src/dev/res/xml/network_security_config.xml

@@ -1,8 +1,8 @@
 <network-security-config>
-    <debug-overrides>
+    <base-config cleartextTrafficPermitted="false">
         <trust-anchors>
-            <!-- Trust user added CAs while debuggable only -->
+            <certificates src="system" />
             <certificates src="user" />
         </trust-anchors>
-    </debug-overrides>
+    </base-config>
 </network-security-config>

bank-sdk/example-app/src/qa/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:networkSecurityConfig="@xml/network_security_config" />
+
+</manifest>

bank-sdk/example-app/src/qa/res/xml/network_security_config.xml

@@ -0,0 +1,8 @@
+<network-security-config>
+    <base-config cleartextTrafficPermitted="false">
+        <trust-anchors>
+            <certificates src="system" />
+            <certificates src="user" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>

bank-sdk/sdk/consumer-rules.pro

@@ -0,0 +1 @@
+-keep class net.gini.android.bank.sdk.capture.digitalinvoice.SelectableLineItem

capture-sdk/sdk/consumer-rules.pro

@@ -0,0 +1,4 @@
+-keep class net.gini.android.capture.network.model.GiniCaptureReturnReason
+-keep class net.gini.android.capture.Document
+-keep class net.gini.android.capture.error.ErrorType
+-keep class net.gini.android.capture.DocumentImportEnabledFileTypes

core-api-library/library/proguard-rules.pro

@@ -16,11 +16,55 @@
 #   public *;
 #}
 
-# Retain Retrofit service methods
--keep,allowobfuscation interface * {
+# Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and
+# EnclosingMethod is required to use InnerClasses.
+-keepattributes Signature, InnerClasses, EnclosingMethod
+
+# Retrofit does reflection on method and parameter annotations.
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+
+# Keep annotation default values (e.g., retrofit2.http.Field.encoded).
+-keepattributes AnnotationDefault
+
+# Retain service method parameters when optimizing.
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
     @retrofit2.http.* <methods>;
 }
 
+# Ignore annotation used for build tooling.
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+
+# Ignore JSR 305 annotations for embedding nullability information.
+-dontwarn javax.annotation.**
+
+# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
+-dontwarn kotlin.Unit
+
+# Top-level functions that can only be used by Kotlin.
+-dontwarn retrofit2.KotlinExtensions
+-dontwarn retrofit2.KotlinExtensions$*
+
+# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
+# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+# Keep inherited services.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface * extends <1>
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+# R8 full mode strips generic signatures from return types if not kept.
+-if interface * { @retrofit2.http.* public *** *(...); }
+-keep,allowoptimization,allowshrinking,allowobfuscation class <3>
+
+# With R8 full mode generic signatures are stripped for classes that are not kept.
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
 # Ignore these missing classes related to okhttp3 as they are not used on Android
 -dontwarn org.bouncycastle.jsse.BCSSLParameters
 -dontwarn org.bouncycastle.jsse.BCSSLSocket