Merge branch 'dev' of github.com:tonkeeper/android_private into dev

Author: polstianka

.github/workflows/cd.yml

@@ -32,9 +32,9 @@ jobs:
 
       - name: Decode signing certificate into a file
         env:
-         CERTIFICATE_BASE64: ${{ secrets.ANDROID_DIST_SIGNING_KEY }}
+          CERTIFICATE_BASE64: ${{ secrets.ANDROID_DIST_SIGNING_KEY }}
         run: |
-         echo $CERTIFICATE_BASE64 | base64 --decode > google-release.keystore
+          echo $CERTIFICATE_BASE64 | base64 --decode > google-release.keystore
 
       - name: Build android beta
         run: bundle exec fastlane android beta

Gemfile.lock

@@ -222,4 +222,4 @@ RUBY VERSION
    ruby 3.3.0p0
 
 BUNDLED WITH
-   2.5.4
+   2.5.4

apps/signer/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -43,15 +45,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-
     packaging {
         resources.excludes.add("/META-INF/{AL2.0,LGPL2.1}")
     }

apps/wallet/api/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
@@ -14,14 +16,6 @@ android {
         minSdk = Build.minSdkVersion
         consumerProguardFiles("consumer-rules.pro")
     }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
 }
 
 dependencies {

apps/wallet/api/src/main/java/com/tonapps/wallet/api/API.kt

@@ -28,14 +28,12 @@ import com.tonapps.wallet.api.entity.ConfigEntity
 import com.tonapps.wallet.api.entity.EthenaEntity
 import com.tonapps.wallet.api.entity.OnRampArgsEntity
 import com.tonapps.wallet.api.entity.OnRampMerchantEntity
-import com.tonapps.wallet.api.entity.SwapEntity
 import com.tonapps.wallet.api.entity.TokenEntity
 import com.tonapps.wallet.api.entity.value.Timestamp
 import com.tonapps.wallet.api.internal.ConfigRepository
 import com.tonapps.wallet.api.internal.InternalApi
 import com.tonapps.wallet.api.internal.SwapApi
 import com.tonapps.wallet.api.tron.TronApi
-import com.tonapps.wallet.api.tron.entity.TronEventEntity
 import io.Serializer
 import io.batteryapi.apis.DefaultApi
 import io.batteryapi.models.Balance
@@ -61,8 +59,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
@@ -191,19 +187,19 @@ class API(
         return withRetry { battery(testnet).getRechargeMethods(false) }
     }
 
-    fun getOnRampData() = internalApi.getOnRampData()
+    fun getOnRampData() = internalApi.getOnRampData(config.webSwapsUrl)
 
-    fun getOnRampPaymentMethods(currency: String) = internalApi.getOnRampPaymentMethods(currency)
+    fun getOnRampPaymentMethods(currency: String) = internalApi.getOnRampPaymentMethods(config.webSwapsUrl, currency)
 
-    fun getOnRampMerchants() = internalApi.getOnRampMerchants()
+    fun getOnRampMerchants() = internalApi.getOnRampMerchants(config.webSwapsUrl)
 
     fun getSwapAssets(): JSONArray = runCatching {
-        swapApi.getSwapAssets()?.let(::JSONArray)
+        swapApi.getSwapAssets(config.webSwapsUrl)?.let(::JSONArray)
     }.getOrNull() ?: JSONArray()
 
     @Throws
     suspend fun calculateOnRamp(args: OnRampArgsEntity): OnRampMerchantEntity.Data = withContext(Dispatchers.IO) {
-        val data = internalApi.calculateOnRamp(args) ?: throw Exception("Empty response")
+        val data = internalApi.calculateOnRamp(config.webSwapsUrl, args) ?: throw Exception("Empty response")
         val json = JSONObject(data)
         val items = json.getJSONArray("items").map { OnRampMerchantEntity(it) }
         val suggested = json.optJSONArray("suggested")?.map { OnRampMerchantEntity(it) } ?: emptyList()
@@ -261,7 +257,11 @@ class API(
         configRepository.refresh(testnet)
     }
 
-    fun swapStream(from: SwapAssetParam, to: SwapAssetParam, userAddress: String) = swapApi.stream(from, to, userAddress)
+    fun swapStream(
+        from: SwapAssetParam,
+        to: SwapAssetParam,
+        userAddress: String
+    ) = swapApi.stream(config.webSwapsUrl, from, to, userAddress)
 
     suspend fun getPageTitle(url: String): String = withContext(Dispatchers.IO) {
         try {
@@ -537,6 +537,15 @@ class API(
         }
     }
 
+    fun getRates(from: String, to: String): Map<String, TokenRates>? {
+        return withRetry {
+            rates().getRates(
+                tokens = listOf(from),
+                currencies = listOf(to)
+            ).rates
+        }
+    }
+
     fun getNft(address: String, testnet: Boolean): NftItem? {
         return withRetry { nft(testnet).getNftItemByAddress(address) }
     }

apps/wallet/api/src/main/java/com/tonapps/wallet/api/Constants.kt

@@ -0,0 +1,6 @@
+package com.tonapps.wallet.api
+
+internal object Constants {
+
+    const val SWAP_PREFIX = "https://swap.tonkeeper.com"
+}

apps/wallet/api/src/main/java/com/tonapps/wallet/api/cronet/CronetInterceptor.java

@@ -8,6 +8,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -77,7 +78,7 @@ private CronetInterceptor(RequestResponseConverter converter) {
     @Override
     public Response intercept(Chain chain) throws IOException {
         if (chain.call().isCanceled()) {
-            throw new IOException("Canceled");
+            throw new CancellationException();
         }
 
         Request request = chain.request();

apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/ConfigEntity.kt

@@ -9,6 +9,7 @@ import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import org.json.JSONObject
 import androidx.core.net.toUri
+import com.tonapps.wallet.api.Constants
 
 @Parcelize
 data class ConfigEntity(
@@ -62,7 +63,8 @@ data class ConfigEntity(
     val tronSwapTitle: String,
     val tronApiKey: String? = null,
     val privacyPolicyUrl: String,
-    val termsOfUseUrl: String
+    val termsOfUseUrl: String,
+    val webSwapsUrl: String,
 ): Parcelable {
 
     @IgnoredOnParcel
@@ -140,9 +142,10 @@ data class ConfigEntity(
         tonkeeperApiUrl = json.optString("tonkeeper_api_url", "https://api.tonkeeper.com"),
         tronSwapUrl = json.optString("tron_swap_url", "https://widget.letsexchange.io/en?affiliate_id=ffzymmunvvyxyypo&coin_from=ton&coin_to=USDT-TRC20&is_iframe=true"),
         tronSwapTitle = json.optString("tron_swap_title", "LetsExchange"),
-        tronApiKey = json.optString("tron_api_key"),
+        // tronApiKey = json.optString("tron_api_key"),
         privacyPolicyUrl = json.getString("privacy_policy"),
         termsOfUseUrl = json.getString("terms_of_use"),
+        webSwapsUrl = json.optString("web_swaps_url", Constants.SWAP_PREFIX)
     )
 
     constructor() : this(
@@ -195,7 +198,8 @@ data class ConfigEntity(
         tronSwapUrl = "https://widget.letsexchange.io/en?affiliate_id=ffzymmunvvyxyypo&coin_from=ton&coin_to=USDT-TRC20&is_iframe=true",
         tronSwapTitle = "LetsExchange",
         privacyPolicyUrl = "https://tonkeeper.com/privacy",
-        termsOfUseUrl = "https://tonkeeper.com/terms"
+        termsOfUseUrl = "https://tonkeeper.com/terms",
+        webSwapsUrl = Constants.SWAP_PREFIX
     )
 
     fun formatTransactionExplorer(testnet: Boolean, tron: Boolean, hash: String): String {

apps/wallet/api/src/main/java/com/tonapps/wallet/api/entity/OnRampArgsEntity.kt

@@ -14,6 +14,15 @@ data class OnRampArgsEntity(
     val paymentMethod: String?
 ) {
 
+    val isSwap: Boolean
+        get() = purchaseType == "swap"
+
+    val isSell: Boolean
+        get() = purchaseType == "sell"
+
+    val withoutPaymentMethod: Boolean
+        get() = isSwap || isSell
+
     fun toJSON() = JSONObject().apply {
         put("from", from)
         put("to", to)

apps/wallet/api/src/main/java/com/tonapps/wallet/api/internal/InternalApi.kt

@@ -1,6 +1,7 @@
 package com.tonapps.wallet.api.internal
 
 import android.content.Context
+import android.util.Log
 import androidx.collection.ArrayMap
 import androidx.core.net.toUri
 import com.google.firebase.crashlytics.FirebaseCrashlytics
@@ -101,10 +102,8 @@ internal class InternalApi(
         return JSONObject(body)
     }
 
-    private fun swapEndpoint(path: String): String {
-        // val host = "dev-swap.tonkeeper.com"
-        val host = "swap.tonkeeper.com"
-        val builder = "https://$host".toUri().buildUpon()
+    private fun swapEndpoint(prefix: String, path: String): String {
+        val builder = prefix.toUri().buildUpon()
             .appendEncodedPath(path)
         _deviceCountry?.let {
             builder.appendQueryParameter("device_country_code", _deviceCountry)
@@ -113,32 +112,27 @@ internal class InternalApi(
         _storeCountry?.let {
             builder.appendQueryParameter("store_country_code", _storeCountry)
         }
-
         return builder.build().toString()
     }
 
-    fun getSwapAssets() = withRetry {
-        okHttpClient.get(swapEndpoint("v2/swap/assets"))
-    }
-
-    fun getOnRampData() = withRetry {
-        okHttpClient.get(swapEndpoint("v2/onramp/currencies"))
+    fun getOnRampData(prefix: String) = withRetry {
+        okHttpClient.get(swapEndpoint(prefix, "v2/onramp/currencies"))
     }
 
-    fun getOnRampPaymentMethods(currency: String) = withRetry {
-        okHttpClient.get(swapEndpoint("v2/onramp/payment_methods"))
+    fun getOnRampPaymentMethods(prefix: String, currency: String) = withRetry {
+        okHttpClient.get(swapEndpoint(prefix, "v2/onramp/payment_methods"))
     }
 
-    fun getOnRampMerchants() = withRetry {
-        okHttpClient.get(swapEndpoint("v2/onramp/merchants"))
+    fun getOnRampMerchants(prefix: String) = withRetry {
+        okHttpClient.get(swapEndpoint(prefix, "v2/onramp/merchants"))
     }
 
-    fun calculateOnRamp(args: OnRampArgsEntity): String? {
+    fun calculateOnRamp(prefix: String, args: OnRampArgsEntity): String? {
         val json = args.toJSON()
         _deviceCountry?.let { json.put("country", _deviceCountry) }
         return withRetry {
             okHttpClient.postJSON(
-                swapEndpoint("v2/onramp/calculate"),
+                swapEndpoint(prefix, "v2/onramp/calculate"),
                 json.toString()
             ).body.string()
         }