diff options
| author | Torsten Grote <t@grobox.de> | 2023-10-11 11:21:59 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2023-10-11 11:42:40 -0300 |
| commit | 5801fe2ea15a468c241d3552ff26af4fa20e0b58 (patch) | |
| tree | 001be11bccd21b3f07ab8b384a5170272f327d23 /cashier | |
| parent | 2a91350f267fa6b4a56bb54039db6d71318fc9e4 (diff) | |
| download | taler-android-5801fe2ea15a468c241d3552ff26af4fa20e0b58.tar.gz taler-android-5801fe2ea15a468c241d3552ff26af4fa20e0b58.tar.bz2 taler-android-5801fe2ea15a468c241d3552ff26af4fa20e0b58.zip | |
upgrade all the things!
Diffstat (limited to 'cashier')
| -rw-r--r-- | cashier/build.gradle | 13 | ||||
| -rw-r--r-- | cashier/proguard-rules.pro | 2 | ||||
| -rw-r--r-- | cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt | 2 | ||||
| -rw-r--r-- | cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/cashier/build.gradle b/cashier/build.gradle index dd8d787..23cbe05 100644 --- a/cashier/build.gradle +++ b/cashier/build.gradle @@ -23,9 +23,7 @@ plugins { android { namespace 'net.taler.cashier' - compileSdkVersion 33 - //noinspection GradleDependency - buildToolsVersion "$build_tools_version" + compileSdk 34 defaultConfig { applicationId "net.taler.cashier" @@ -48,15 +46,16 @@ android { } compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } buildFeatures { + buildConfig = true viewBinding = true } packagingOptions { @@ -67,7 +66,7 @@ android { lint { abortOnError true - ignore 'WrongConstant' + warning 'WrongConstant' ignoreWarnings false } } diff --git a/cashier/proguard-rules.pro b/cashier/proguard-rules.pro index ced7b5c..9928f24 100644 --- a/cashier/proguard-rules.pro +++ b/cashier/proguard-rules.pro @@ -26,3 +26,5 @@ # androidx.security:security-crypto # https://github.com/google/tink/issues/361 -keep class * extends com.google.crypto.tink.shaded.protobuf.GeneratedMessageLite { *; } + +-dontwarn org.slf4j.impl.StaticLoggerBinder diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt index 6e8a3db..3085bef 100644 --- a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt +++ b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt @@ -39,7 +39,7 @@ import net.taler.cashier.databinding.FragmentConfigBinding import net.taler.common.exhaustive import net.taler.common.showError -private const val URL_BANK_TEST = "https://bank.demo.taler.net/demobanks/default" +private const val URL_BANK_TEST = "https://bank.demo.taler.net" private const val URL_BANK_TEST_REGISTER = "https://bank.demo.taler.net/webui/#/register" class ConfigFragment : Fragment() { diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt index c79fd12..6c6c5cf 100644 --- a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt +++ b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt @@ -114,7 +114,7 @@ class ConfigManager( } private suspend fun checkConfig(config: Config) = withContext(Dispatchers.IO) { - val url = "${config.bankUrl}/integration-api/config" + val url = "${config.bankUrl}/config" Log.d(TAG, "Checking config: $url") val configResponse = response { httpClient.get(url).body<ConfigResponse>() @@ -125,7 +125,7 @@ class ConfigManager( // we need to check an endpoint that requires authentication as well // to see if the credentials are valid val balanceResponse = response { - val authUrl = "${config.bankUrl}/access-api/accounts/${config.username}" + val authUrl = "${config.bankUrl}/accounts/${config.username}" Log.d(TAG, "Checking auth: $authUrl") httpClient.get(authUrl) { header(Authorization, config.basicAuth) |