From 389e302ef884961f49024d9a5c141221e67a61f4 Mon Sep 17 00:00:00 2001 From: kcw-grunt Date: Mon, 28 Mar 2022 00:01:43 -0700 Subject: [PATCH 1/5] WIP: DNC Dropped in the UD code prior to testing --- .../tools/manager/ResolutionResult.kt | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt b/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt index b16ca4307..1f351e19c 100644 --- a/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt +++ b/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt @@ -7,13 +7,8 @@ import com.unstoppabledomains.resolution.DomainResolution import com.unstoppabledomains.resolution.Resolution import com.unstoppabledomains.resolution.naming.service.NamingServiceType import timber.log.Timber +import android.os.AsyncTask - -/** Litewallet - * Created by Mohamed Barry on 12/23/20 - * email: mosadialiou@gmail.com - * Copyright © 2020 Litecoin Foundation. All rights reserved. - */ data class ResolutionResult(val error: NamingServiceException?, val address: String?) class UDResolution { @@ -29,4 +24,23 @@ class UDResolution { ResolutionResult(err, null) } } -} \ No newline at end of file +} + + +//data class ResolutionResult(val error: NamingServiceException?, val address: String?) {} +// +//class AsyncResolution : AsyncTask() { +// private val tool: DomainResolution = Resolution() +// +// override fun doInBackground(vararg params: String?): ResolutionResult { +// val domain = params[0] +// val currency = params[1] +// return try { +// val address = this.tool.addr(domain, currency) +// ResolutionResult(null, address) +// } catch(err: NamingServiceException) { +// err.printStackTrace(); +// ResolutionResult(err, null) +// } +// } +//} \ No newline at end of file From d5c524cffbf4d0ceccd6a6bb4d956ca661ee55bb Mon Sep 17 00:00:00 2001 From: kcw-grunt Date: Mon, 28 Mar 2022 00:02:58 -0700 Subject: [PATCH 2/5] Added study link --- .../main/java/com/breadwallet/tools/manager/ResolutionResult.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt b/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt index 1f351e19c..1d61c77a3 100644 --- a/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt +++ b/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt @@ -26,7 +26,7 @@ class UDResolution { } } - +//https://github.com/unstoppabledomains/resolution-java/blob/master/samples.md //data class ResolutionResult(val error: NamingServiceException?, val address: String?) {} // //class AsyncResolution : AsyncTask() { From 3101d7c276b0d467a3fcb6bfbca06f5c65a191fa Mon Sep 17 00:00:00 2001 From: Victor Sima Date: Sat, 16 Apr 2022 16:52:03 -0400 Subject: [PATCH 3/5] Fix unstoppable domains dependency --- app/build.gradle | 2 +- .../java/com/breadwallet/tools/manager/ResolutionResult.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 242aacff0..24aeabc18 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -308,7 +308,7 @@ dependencies { implementation 'com.jakewharton.timber:timber:5.0.1' // Unstoppable domain - implementation 'com.unstoppabledomains:resolution:2.0.0' + implementation 'com.unstoppabledomains:resolution:5.0.0' // Progress Button implementation 'com.github.razir.progressbutton:progressbutton:2.1.0' diff --git a/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt b/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt index 1d61c77a3..eb0460fc1 100644 --- a/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt +++ b/app/src/main/java/com/breadwallet/tools/manager/ResolutionResult.kt @@ -7,13 +7,12 @@ import com.unstoppabledomains.resolution.DomainResolution import com.unstoppabledomains.resolution.Resolution import com.unstoppabledomains.resolution.naming.service.NamingServiceType import timber.log.Timber -import android.os.AsyncTask data class ResolutionResult(val error: NamingServiceException?, val address: String?) class UDResolution { private val tool: DomainResolution = Resolution.builder() - .infura(NamingServiceType.CNS, Network.MAINNET, BuildConfig.INFURA_KEY) +// .infura(NamingServiceType.CNS, Network.MAINNET, BuildConfig.INFURA_KEY) .build() fun resolve(domain: String): ResolutionResult { From 6d408f1296f18ca0a52b4b5fc1c10e6a78454ad7 Mon Sep 17 00:00:00 2001 From: kcw-grunt Date: Sun, 17 Apr 2022 22:40:00 +0100 Subject: [PATCH 4/5] Updated the UD ext text WIP::::Need to refactor once UK and deletion on SV, NL, DA --- app/src/main/res/layout/fragment_send.xml | 9 ++++----- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 14 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/src/main/res/layout/fragment_send.xml b/app/src/main/res/layout/fragment_send.xml index 62bfed85f..22918bc3a 100644 --- a/app/src/main/res/layout/fragment_send.xml +++ b/app/src/main/res/layout/fragment_send.xml @@ -161,18 +161,17 @@ + tools:ignore="TextContrastCheck" /> Geben Sie eine Litecoin-Adresse ein - Geben Sie eine .crypto- oder .zil-Domain ein + Geben Sie eine .crypto-, .wallet-, .zil-, .nft-, .blockchain-,\n.bitcoin-, .coin-, .888-, .dao- oder .x-Domäne ein. oder diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9178ffafd..01d8587dd 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -438,7 +438,7 @@ Introduzca una dirección de Litecoin - Ingrese un dominio .crypto o .zil + Ingrese un dominio .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao o .x. o diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e3f7a9d4e..06c336b99 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -438,7 +438,7 @@ Entrez une adresse Litecoin - Entrez un domaine .crypto ou .zil + Saisissez un domaine .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao ou .x. Ou diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index de2f3465f..f8bfcb919 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -438,7 +438,7 @@ Masukkan alamat Litecoin - Masukkan domain .crypto atau .zil + Masukkan domain .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao, atau .x. Atau diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 791dc3315..3350da8ec 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -438,7 +438,7 @@ Inserire un indirizzo Litecoin - Inserisci un dominio .crypto o .zil + Inserisci un dominio .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao o .x. o diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ab7e494e4..93e5af426 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -438,7 +438,7 @@ Litecoinのアドレスを入力してください。 - .cryptoまたは.zilドメインを入力してください + .crypto、.wallet、.zil、.nft、.blockchain、\ n.bitcoin、.coin、.888、.dao、または.xドメインを入力します。 或いは diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 4e4421515..eda1a50a0 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -438,7 +438,7 @@ 라이트 코인 주소를 입력하세요 - .crypto 또는 .zil 도메인을 입력하세요. + .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao 또는 .x 도메인을 입력하세요. 또는 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index d8132941b..e104fdf81 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -438,7 +438,7 @@ Introduzir um endereço Litecoin - Insira um domínio .crypto ou .zil + Insira um domínio .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao ou .x. ou diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b2f55f277..ddf1d9398 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -438,7 +438,7 @@ Введите адрес Litecoin - Введите домен .crypto или .zil + Введите домен .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao или .x. или diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index faf31cef8..0007ae2bc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -470,7 +470,7 @@ Bir Litecoin adresi girin - Bir .crypto veya .zil alanı girin + Bir .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao veya .x alan adı girin. Veya diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 637fb639b..a6a32037c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -438,7 +438,7 @@ 输入一个Litecoin地址 - 输入.crypto或.zil域 + 输入 .crypto、.wallet、.zil、.nft、.blockchain、\n.bitcoin、.coin、.888、.dao 或 .x 域。 要么 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4b5edd39a..dc5ea995b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -438,7 +438,7 @@ 輸入萊特幣地址 - 輸入.crypto或.zil域 + 輸入 .crypto、.wallet、.zil、.nft、.blockchain、\n.bitcoin、.coin、.888、.dao 或 .x 域。 要么 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae55186b1..aede0e59d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -435,7 +435,7 @@ Enter a Litecoin address - Enter a .crypto or .zil domain + Enter a .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao, or .x domain. Or From 9fef1f18377eb07aef969282e3bea3470e8f741d Mon Sep 17 00:00:00 2001 From: kcw-grunt Date: Mon, 18 Apr 2022 08:08:10 +0100 Subject: [PATCH 5/5] added UK lang --- app/build.gradle | 4 +++- app/src/main/res/values-uk/strings.xml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 24aeabc18..f0451c998 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,7 +90,9 @@ android { unitTests.returnDefaultValues = true } packagingOptions { - pickFirst 'protobuf.meta' + resources { + pickFirsts += ['protobuf.meta'] + } } externalNativeBuild { cmake { diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 47ebf3231..30c18f575 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -429,7 +429,7 @@ Введіть адресу Litecoin - Введіть домен .crypto або .zil + Введіть домен .crypto, .wallet, .zil, .nft, .blockchain,\n.bitcoin, .coin, .888, .dao або .x. Or