Skip to content
Open
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
156 changes: 88 additions & 68 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.4.0)
aws-partitions (1.1257.0)
aws-sdk-core (3.251.0)
aws-partitions (1.1283.0)
aws-sdk-core (3.254.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
base64
bigdecimal
jmespath (~> 1, >= 1.6.1)
logger
aws-sdk-kms (1.129.0)
aws-sdk-core (~> 3, >= 3.248.0)
aws-sdk-kms (1.130.0)
aws-sdk-core (~> 3, >= 3.254.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.225.0)
aws-sdk-core (~> 3, >= 3.248.0)
aws-sdk-s3 (1.229.0)
aws-sdk-core (~> 3, >= 3.254.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.12.1)
Expand All @@ -35,47 +35,36 @@ GEM
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
csv (3.3.5)
csv (3.3.6)
declarative (0.0.20)
digest-crc (0.7.0)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
domain_name (0.6.20260902)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.112.0)
faraday (1.10.5)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
erb (6.0.7)
excon (1.7.1)
logger
faraday (2.14.3)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-cookie_jar (0.0.8)
faraday (>= 0.8.0)
http-cookie (>= 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.1)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-follow_redirects (0.5.0)
faraday (>= 1, < 3)
faraday-multipart (1.2.0)
multipart-post (~> 2.0)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.4)
faraday_middleware (1.2.1)
faraday (~> 1.0)
faraday-net_http (3.4.4)
net-http (~> 0.5)
faraday-retry (2.4.0)
faraday (~> 2.0)
fastimage (2.4.1)
fastlane (2.235.0)
fastlane (2.238.0)
CFPropertyList (>= 2.3, < 5.0.0)
abbrev (~> 0.1)
addressable (>= 2.8, < 3.0.0)
addressable (>= 2.9.0, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.197)
babosa (>= 1.0.3, < 2.0.0)
Expand All @@ -87,10 +76,12 @@ GEM
csv (~> 3.3)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
excon (>= 0.71.0, < 2.0.0)
faraday (~> 2.7)
faraday-cookie_jar (~> 0.0.8)
faraday-follow_redirects (~> 0.3)
faraday-multipart (~> 1.0)
faraday-retry (~> 2.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.1.0)
gh_inspector (>= 1.1.2, < 2.0.0)
Expand All @@ -100,10 +91,12 @@ GEM
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
irb (>= 1.8)
json (< 3.0.0)
jwt (>= 2.1.0, < 4)
jwt (>= 2.10.3, < 4)
logger (>= 1.6, < 2.0)
mini_magick (>= 4.9.4, < 5.0.0)
multi_json (~> 1.12)
multipart-post (>= 2.0.0, < 3.0.0)
mutex_m (~> 0.3)
naturally (~> 2.2)
Expand All @@ -115,7 +108,7 @@ GEM
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
terminal-table (~> 4)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
Expand All @@ -130,34 +123,35 @@ GEM
google-apis-firebaseappdistribution_v1alpha (>= 0.12.0)
fastlane-sirp (1.1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.101.0)
google-apis-androidpublisher_v3 (0.107.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-core (0.18.0)
addressable (~> 2.5, >= 2.5.1)
googleauth (~> 1.9)
httpclient (>= 2.8.3, < 3.a)
mini_mime (~> 1.0)
mutex_m
google-apis-core (1.2.5)
addressable (~> 2.9)
faraday (~> 2.13)
faraday-follow_redirects (~> 0.3)
googleauth (~> 1.14)
mini_mime (~> 1.1)
multi_json (~> 1.11)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
google-apis-firebaseappdistribution_v1 (0.19.0)
retriable (>= 3.1, < 5.0)
google-apis-firebaseappdistribution_v1 (0.22.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-firebaseappdistribution_v1alpha (0.28.0)
google-apis-firebaseappdistribution_v1alpha (0.30.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-iamcredentials_v1 (0.27.0)
google-apis-iamcredentials_v1 (0.28.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-playcustomapp_v1 (0.17.0)
google-apis-playcustomapp_v1 (0.18.0)
google-apis-core (>= 0.15.0, < 2.a)
google-apis-storage_v1 (0.63.0)
google-apis-storage_v1 (0.66.0)
google-apis-core (>= 0.15.0, < 2.a)
google-cloud-core (1.8.0)
google-cloud-core (1.9.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (2.2.2)
base64 (~> 0.2)
faraday (>= 1.0, < 3.a)
google-cloud-errors (1.6.0)
google-cloud-storage (1.60.0)
google-cloud-errors (1.7.0)
google-cloud-storage (1.62.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-core (>= 0.18, < 2)
Expand All @@ -167,7 +161,7 @@ GEM
googleauth (~> 1.9)
mini_mime (~> 1.0)
google-logging-utils (0.2.0)
googleauth (1.17.0)
googleauth (1.17.4)
faraday (>= 1.0, < 3.a)
google-cloud-env (~> 2.2)
google-logging-utils (~> 0.1)
Expand All @@ -179,33 +173,54 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.8)
domain_name (~> 0.5)
httpclient (2.9.0)
mutex_m
io-console (0.9.2)
irb (1.18.0)
pp (>= 0.6.0)
prism (>= 1.3.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jmespath (1.6.2)
json (2.19.8)
json (2.21.2)
jwt (3.2.0)
base64
logger (1.7.0)
mime-types (3.7.0)
logger
mime-types-data (~> 3.2025, >= 3.2025.0507)
mime-types-data (3.2026.0414)
mime-types-data (3.2026.0701)
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.21.1)
multipart-post (2.4.1)
mutex_m (0.3.0)
nanaimo (0.4.0)
naturally (2.3.0)
net-http (0.9.1)
uri (>= 0.11.1)
netrc (0.11.0)
nkf (0.2.0)
nkf (0.3.0)
optparse (0.8.1)
os (1.1.4)
ostruct (0.6.3)
plist (3.7.2)
pp (0.6.4)
prettyprint
prettyprint (0.2.0)
prism (1.9.0)
pstore (0.2.1)
public_suffix (7.0.5)
rake (13.4.2)
rbs (4.2.0)
logger
prism (>= 1.6.0)
tsort
rdoc (8.0.0)
erb
prism (>= 1.6.0)
rbs (>= 4.0.0)
tsort
reline (0.7.0)
io-console (~> 0.5)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
Expand All @@ -215,10 +230,9 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
retriable (3.8.0)
retriable (4.2.0)
rexml (3.4.4)
rouge (3.28.0)
ruby2_keywords (0.0.5)
rubyzip (2.4.1)
security (0.1.5)
signet (0.22.0)
Expand All @@ -229,22 +243,28 @@ GEM
CFPropertyList
naturally
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
terminal-table (4.0.0)
unicode-display_width (>= 1.1.1, < 4)
trailblazer-option (0.1.2)
tsort (0.2.0)
tty-cursor (0.7.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (2.6.0)
unicode-display_width (3.2.0)
unicode-emoji (~> 4.1)
unicode-emoji (4.2.0)
uri (1.1.1)
word_wrap (1.0.0)
xcodeproj (1.27.0)
xcodeproj (1.28.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
base64
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
nkf
rexml (>= 3.3.6, < 4.0)
xcpretty (0.4.1)
rouge (~> 3.28.0)
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kotlin = "2.1.21"
ksp = "2.1.21-2.0.1"

# judokit-android
judo3ds2 = "2.1.0"
judo3ds2 = "2.2.0"
kotlinxCoroutines = "1.9.0"
retrofit2 = "2.11.0"
coreKtx = "1.16.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ import com.judokit.android.examples.settings.readImportedJson
import com.judokit.android.examples.settings.showImportSettingsDialog
import com.judopay.judokit.android.JUDO_OPTIONS
import com.judopay.judokit.android.JudoActivityResultContracts
import com.judopay.judokit.android.api.factory.JudoApiServiceFactory
import com.judopay.judokit.android.api.factory.RecommendationApiServiceFactory
import com.judopay.judokit.android.api.factory.JudoHttpInterceptors
import com.judopay.judokit.android.model.JudoPaymentResult
import com.judopay.judokit.android.model.PaymentWidgetType
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -138,8 +137,7 @@ class DemoFeatureListActivity : AppCompatActivity() {
.alwaysReadResponseBody(false)
.build(),
)
JudoApiServiceFactory.externalInterceptors = interceptors
RecommendationApiServiceFactory.externalInterceptors = interceptors
JudoHttpInterceptors.interceptors = interceptors
}

private fun setupRecyclerView() {
Expand Down
12 changes: 6 additions & 6 deletions judokit-android/api/judokit-android.api
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,14 @@ public final class com/judopay/judokit/android/api/factory/JudoApiServiceFactory
public synthetic fun create (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Ljava/lang/Object;
public fun createApiService (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Lcom/judopay/judokit/android/api/JudoApiService;
public synthetic fun createApiService (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Ljava/lang/Object;
public fun getExternalInterceptors ()Ljava/util/List;
public fun getGson ()Lcom/google/gson/Gson;
public fun getOkHttpClient (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Lokhttp3/OkHttpClient;
public fun setExternalInterceptors (Ljava/util/List;)V
}

public final class com/judopay/judokit/android/api/factory/JudoHttpInterceptors {
public static final field INSTANCE Lcom/judopay/judokit/android/api/factory/JudoHttpInterceptors;
public final fun getInterceptors ()Ljava/util/List;
public final fun setInterceptors (Ljava/util/List;)V
}

public final class com/judopay/judokit/android/api/factory/RecommendationApiServiceFactory : com/judopay/judokit/android/api/factory/ServiceFactory {
Expand All @@ -402,10 +406,8 @@ public final class com/judopay/judokit/android/api/factory/RecommendationApiServ
public synthetic fun create (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Ljava/lang/Object;
public fun createApiService (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Lcom/judopay/judokit/android/api/RecommendationApiService;
public synthetic fun createApiService (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Ljava/lang/Object;
public fun getExternalInterceptors ()Ljava/util/List;
public fun getGson ()Lcom/google/gson/Gson;
public fun getOkHttpClient (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Lokhttp3/OkHttpClient;
public fun setExternalInterceptors (Ljava/util/List;)V
}

public final class com/judopay/judokit/android/api/factory/ResultAdapter : retrofit2/CallAdapter {
Expand All @@ -430,10 +432,8 @@ public abstract class com/judopay/judokit/android/api/factory/ServiceFactory {
public abstract fun create (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Ljava/lang/Object;
public abstract fun createApiService (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Ljava/lang/Object;
protected final fun createRetrofit (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;Ljava/lang/String;)Lretrofit2/Retrofit;
public abstract fun getExternalInterceptors ()Ljava/util/List;
public abstract fun getGson ()Lcom/google/gson/Gson;
public abstract fun getOkHttpClient (Landroid/content/Context;Lcom/judopay/judokit/android/Judo;)Lokhttp3/OkHttpClient;
public abstract fun setExternalInterceptors (Ljava/util/List;)V
}

public final class com/judopay/judokit/android/api/interceptor/NetworkConnectivityInterceptor : okhttp3/Interceptor {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.judopay.judokit.android.api

import com.judopay.judokit.android.api.model.response.cdn.DsCertsResponse
import retrofit2.Response
import retrofit2.http.GET
import retrofit2.http.Header
import retrofit2.http.Headers
import retrofit2.http.Url

internal interface DsCdnApiService {
@GET
@Headers("Accept: application/json")
suspend fun fetchDsCerts(
@Url url: String,
@Header("If-None-Match") ifNoneMatch: String?,
@Header("If-Modified-Since") ifModifiedSince: String?,
): Response<DsCertsResponse>
}
Loading
Loading