Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3ds auth release mode #358

Merged
merged 2 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ Some request methods allow the user to authorize the payment with an external ap

## ProGuard rules

If you enable ProGuard, then add these rules to your ProGuard file.
If you enable ProGuard, then add these rules to your ProGuard file and apply any missing rules that your IDE notifies you about.

```ProGuard
-dontwarn okio.**
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ android {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.debug
}
}

Expand Down
25 changes: 25 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,30 @@
-dontwarn javax.annotation.**
-dontwarn com.squareup.**

-dontwarn org.conscrypt.Conscrypt$Version
-dontwarn org.conscrypt.Conscrypt
-dontwarn org.conscrypt.ConscryptHostnameVerifier
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
-dontwarn org.openjsse.net.ssl.OpenJSSE

-dontwarn java.beans.ConstructorProperties
-dontwarn java.beans.Transient
-dontwarn javax.mail.Address
-dontwarn javax.mail.Authenticator
-dontwarn javax.mail.BodyPart
-dontwarn javax.mail.Message$RecipientType
-dontwarn javax.mail.Message
-dontwarn javax.mail.Multipart
-dontwarn javax.mail.PasswordAuthentication
-dontwarn javax.mail.Session
-dontwarn javax.mail.Transport
-dontwarn javax.mail.internet.AddressException
-dontwarn javax.mail.internet.InternetAddress
-dontwarn javax.mail.internet.MimeBodyPart
-dontwarn javax.mail.internet.MimeMessage
-dontwarn javax.mail.internet.MimeMultipart
-dontwarn org.w3c.dom.bootstrap.DOMImplementationRegistry

-keep class co.omise.android.** { *; }
-keep class com.nimbusds.jose.** { *; }
1 change: 1 addition & 0 deletions sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ android {
buildConfigField "int", "VERSION_CODE", "$omise_sdk_code_version"
buildConfigField "String", "VERSION_NAME", "\"$omise_sdk_version\""
testInstrumentationRunner "co.omise.android.OmiseTestRunner"
consumerProguardFiles 'proguard-rules.pro'
}

buildTypes {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package co.omise.android

import NetceteraConfig
import android.app.Activity
import android.content.Context
import android.os.Build
import android.util.Base64
import co.omise.android.models.NetceteraConfig
import com.netcetera.threeds.sdk.api.ThreeDS2Service
import com.netcetera.threeds.sdk.api.configparameters.builder.ConfigurationBuilder
import com.netcetera.threeds.sdk.api.configparameters.builder.SchemeConfiguration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import android.net.Uri
import co.omise.android.AuthorizingPaymentURLVerifier
import co.omise.android.api.Client
import co.omise.android.models.NetceteraConfig
import com.netcetera.threeds.sdk.api.exceptions.InvalidInputException
import java.net.URL

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package co.omise.android.models
import co.omise.android.api.RequestBuilder
import co.omise.android.models.Model
import com.fasterxml.jackson.annotation.JsonProperty
import kotlinx.android.parcel.Parcelize
import okhttp3.HttpUrl
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package co.omise.android.ui

import NetceteraConfig
import ThreeDSConfigProvider
import android.app.Activity
import androidx.lifecycle.LiveData
Expand All @@ -14,6 +13,7 @@ import co.omise.android.ThreeDS2ServiceWrapper
import co.omise.android.api.Client
import co.omise.android.config.UiCustomization
import co.omise.android.models.Authentication
import co.omise.android.models.NetceteraConfig
import co.omise.android.models.Serializer
import com.netcetera.threeds.sdk.ThreeDS2ServiceInstance
import com.netcetera.threeds.sdk.api.transaction.Transaction
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package co.omise.android.ui

import NetceteraConfig
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import co.omise.android.AuthorizingPaymentURLVerifier
Expand All @@ -11,6 +10,7 @@ import co.omise.android.api.Request
import co.omise.android.models.Authentication
import co.omise.android.models.Authentication.AuthenticationStatus
import co.omise.android.models.AuthenticationAPIError
import co.omise.android.models.NetceteraConfig
import com.netcetera.threeds.sdk.api.exceptions.InvalidInputException
import com.netcetera.threeds.sdk.api.exceptions.SDKRuntimeException
import com.netcetera.threeds.sdk.api.transaction.AuthenticationRequestParameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import co.omise.android.AuthorizingPaymentURLVerifier
import co.omise.android.api.Client
import co.omise.android.api.Request
import co.omise.android.models.NetceteraConfig
import com.netcetera.threeds.sdk.api.exceptions.InvalidInputException
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest
Expand Down
Loading