Skip to content

Commit 23ec978

Browse files
authored
Merge pull request #725 from synonymdev/fix/default-invoice-description
fix: remove default invoice description
2 parents 5619875 + b0746ec commit 23ec978

12 files changed

Lines changed: 14 additions & 43 deletions

File tree

README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,16 @@ To build the mainnet flavor for release run:
153153
./gradlew assembleMainnetRelease
154154
```
155155

156+
#### Android App Bundle (AAB)
157+
158+
For Play Store submission, build an AAB instead of APK:
159+
160+
```sh
161+
./gradlew bundleMainnetRelease
162+
```
163+
164+
AAB is generated in `app/build/outputs/bundle/mainnetRelease/`.
165+
156166
### Build for E2E Testing
157167

158168
Pass `E2E=true` and build any flavor. By default, E2E uses a local Electrum override.

app/src/main/java/to/bitkit/env/Env.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ internal object Env {
4343

4444
const val FILE_PROVIDER_AUTHORITY = "${BuildConfig.APPLICATION_ID}.fileprovider"
4545
const val SUPPORT_EMAIL = "support@synonym.to"
46-
const val DEFAULT_INVOICE_MESSAGE = "Bitkit"
4746
const val PIN_LENGTH = 4
4847
const val PIN_ATTEMPTS = 8
4948

app/src/main/java/to/bitkit/repositories/BlocktankRepo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class BlocktankRepo @Inject constructor(
195195

196196
suspend fun createCjit(
197197
amountSats: ULong,
198-
description: String = Env.DEFAULT_INVOICE_MESSAGE,
198+
description: String = "",
199199
): Result<IcJitEntry> = withContext(bgDispatcher) {
200200
runCatching {
201201
if (coreService.isGeoBlocked()) throw ServiceError.GeoBlocked()

app/src/main/java/to/bitkit/repositories/WalletRepo.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ class WalletRepo @Inject constructor(
270270
val newBip21 = buildBip21Url(
271271
bitcoinAddress = address,
272272
amountSats = amountSats,
273-
message = message.ifBlank { Env.DEFAULT_INVOICE_MESSAGE },
273+
message = message,
274274
lightningInvoice = getBolt11(),
275275
)
276276
setBip21(newBip21)
@@ -386,7 +386,7 @@ class WalletRepo @Inject constructor(
386386
fun buildBip21Url(
387387
bitcoinAddress: String,
388388
amountSats: ULong? = null,
389-
message: String = Env.DEFAULT_INVOICE_MESSAGE,
389+
message: String = "",
390390
lightningInvoice: String = "",
391391
): String {
392392
return Bip21Utils.buildBip21Url(

app/src/main/java/to/bitkit/services/LightningService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ class LightningService @Inject constructor(
467467
suspend fun receive(sat: ULong? = null, description: String, expirySecs: UInt = 3600u): String {
468468
val node = this.node ?: throw ServiceError.NodeNotSetup()
469469

470-
val message = description.ifBlank { Env.DEFAULT_INVOICE_MESSAGE }
470+
val message = description
471471

472472
return ServiceQueue.LDK.background {
473473
val bolt11Invoice: Bolt11Invoice = if (sat != null) {

app/src/main/res/values-cs/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -720,8 +720,6 @@
720720
<string name="settings__widgets__nav_title">Widgety</string>
721721
<string name="settings__widgets__showWidgetTitles">Zobrazit názvy widgetů</string>
722722
<string name="settings__widgets__showWidgets">Widgety</string>
723-
<string name="slashtags__auth_depricated_msg">Slashauth je zastaralý. Používejte prosím Bitkit Beta.</string>
724-
<string name="slashtags__auth_depricated_title">Nedoporučený</string>
725723
<string name="slashtags__onboarding_profile1_header">Vlastněte svůj\n&lt;accent&gt;profil&lt;/accent&gt;</string>
726724
<string name="slashtags__onboarding_profile1_text">Nastavte si veřejný profil a odkazy, aby vás kontakty ze služby Bitkit mohly kdykoli a kdekoli kontaktovat nebo vám zaplatit.</string>
727725
<string name="slashtags__profile">Profil</string>

app/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,8 +756,6 @@
756756
<string name="slashtags__onboarding_profile1_text">Richte dein öffentliches Profil und Links ein, damit deine Bitkit-Kontakte dich erreichen oder bezahlen können, jederzeit und überall.</string>
757757
<string name="slashtags__profile">Profil</string>
758758
<string name="slashtags__profile_create">Profil erstellen</string>
759-
<string name="slashtags__auth_depricated_title">Abgelehnt</string>
760-
<string name="slashtags__auth_depricated_msg">Slashauth ist veraltet. Bitte verwenden Sie Bitkit Beta.</string>
761759
<string name="wallet__drawer__wallet">Wallet</string>
762760
<string name="wallet__drawer__activity">Aktivität</string>
763761
<string name="wallet__drawer__contacts">Kontakte</string>

app/src/main/res/values-es/strings.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@
460460
<string name="security__pin_security_header">Aumentar la seguridad</string>
461461
<string name="security__pin_security_title">Protege\ntus bitcoin</string>
462462
<string name="security__pin_security_text">Para mejorar la seguridad del monedero, puede establecer un código PIN y Face ID.</string>
463-
<string name="security__pin_security_title__styled">&lt;accent&gt;Protege&lt;/accent&gt;\ntu bitcoin</string>
464463
<string name="security__pin_security_button">Proteger Monedero</string>
465464
<string name="security__pin_send_title">Introducir Código PIN</string>
466465
<string name="security__pin_choose_header">Elija un PIN de 4 dígitos</string>
@@ -654,7 +653,6 @@
654653
<string name="settings__adv__section_payments">Pagos</string>
655654
<string name="settings__adv__section_networks">Redes</string>
656655
<string name="settings__adv__section_other">Otros</string>
657-
<string name="settings__adv__section_quickpay">QuickPay</string>
658656
<string name="settings__adv__coin_selection">Selección de monedas</string>
659657
<string name="settings__adv__cs_method">Método de selección de monedas</string>
660658
<string name="settings__adv__cs_manual">Manual</string>
@@ -670,7 +668,6 @@
670668
<string name="settings__adv__cs_max_description">Usa los UTXOs de mayor valor primero</string>
671669
<string name="settings__adv__cs_min">Minimizar</string>
672670
<string name="settings__adv__cs_min_description">Usa los UTXOs de menor valor primero</string>
673-
<string name="settings__adv__notifications">Pagos en Segundo Plano</string>
674671
<string name="settings__adv__address_viewer">Visualizador de direcciones</string>
675672
<string name="settings__adv__suggestions_reset">Restablecer sugerencias</string>
676673
<string name="settings__adv__reset_title">¿Restablecer sugerencias?</string>
@@ -680,12 +677,6 @@
680677
<string name="settings__adv__lightning_node">Nodo Lightning</string>
681678
<string name="settings__adv__electrum_server">Servidor Electrum</string>
682679
<string name="settings__adv__rgs_server">Rapid-Gossip-Sync</string>
683-
<string name="settings__adv__quickpay">QuickPay</string>
684-
<string name="settings__adv__quickpay_desc">Paga facturas Lightning automáticamente sin confirmar</string>
685-
<string name="settings__adv__quickpay_max_title">Límite Máximo de QuickPay</string>
686-
<string name="settings__adv__quickpay_max_value">Establecer en {amount}</string>
687-
<string name="settings__adv__quickpay_switch">Paga facturas hasta {amount}</string>
688-
<string name="settings__adv__save_scanned_addresses">Guardar direcciones escaneadas y cargadas</string>
689680
<string name="settings__fee__fast__label">Rápido (más caro)</string>
690681
<string name="settings__fee__fast__value">Rápido</string>
691682
<string name="settings__fee__fast__description">± 10-20 minutos</string>
@@ -705,7 +696,6 @@
705696
<string name="settings__addr__addr_change">Cambiar direcciones</string>
706697
<string name="settings__addr__addr_receiving">Direcciones de recepción</string>
707698
<string name="settings__addr__gen_20">Generar 20 más</string>
708-
<string name="settings__addr__gen_20_max">Máximo de direcciones generadas</string>
709699
<string name="settings__addr__no_addrs_str">Sin direcciones</string>
710700
<string name="settings__addr__spend_number">Gastar ({count}) direcciones seleccionadas</string>
711701
<string name="settings__addr__check_balances">Consultar Saldos</string>
@@ -728,24 +718,12 @@
728718
<string name="settings__es__server_error_description">Bitkit no pudo conectarse al servidor Electrum especificado.</string>
729719
<string name="settings__rgs__server_url">URL del Servidor Rapid-Gossip-Sync</string>
730720
<string name="settings__rgs__button_connect">Conectar</string>
731-
<string name="settings__rgs__button_reset">Restablecer valores predeterminados</string>
732-
<string name="settings__rgs__update_success_message">Conexión exitosa a {url}</string>
733721
<string name="settings__rgs__update_success_description">Bitkit se ha conectado correctamente al servidor Rapid-Gossip-Sync especificado.</string>
734722
<string name="settings__rgs__update_success_title">Servidor Rapid-Gossip-Sync Actualizado</string>
735-
<string name="slashtags__contact_add_error">No se Puede Añadir Contacto</string>
736-
<string name="slashtags__contact_add_error_msg">Por favor, comprueba si el código QR es una clave de contacto válida.</string>
737-
<string name="slashtags__contact_delete_error_description">Bitkit no pudo eliminar el contacto.</string>
738-
<string name="slashtags__contact_delete_error_title">Eliminación de Contacto Fallida</string>
739-
<string name="slashtags__contact_edit_error">Error al Editar Contacto</string>
740-
<string name="slashtags__contact_edit_error_description">Bitkit no pudo guardar la información del contacto.</string>
741-
<string name="slashtags__edit_error">Bitkit no pudo guardar tu perfil.</string>
742-
<string name="slashtags__edit_error_title">Guardado de Perfil Fallido</string>
743723
<string name="slashtags__onboarding_profile1_text">Configura tu perfil público y enlaces para que tus contactos Bitkit puedan localizarte o pagarte en cualquier momento y lugar.</string>
744724
<string name="slashtags__onboarding_profile1_header">Configura tu\n&lt;accent&gt;perfil público&lt;/accent&gt;</string>
745725
<string name="slashtags__profile">Perfil</string>
746726
<string name="slashtags__profile_create">Crear perfil</string>
747-
<string name="slashtags__profile_delete_dialogue">¿Estás seguro de que quieres eliminar este enlace de tu perfil?</string>
748-
<string name="slashtags__profile_key">Clave de perfil</string>
749727
<string name="sweep__balance_format">Saldo: {balance}</string>
750728
<string name="sweep__checking_description">Por favor espera mientras Bitkit comprueba si hay fondos en esta dirección.</string>
751729
<string name="sweep__checking_loading">Comprobando si hay fondos...</string>
@@ -778,10 +756,6 @@
778756
<string name="sweep__total">Total</string>
779757
<string name="sweep__utxo_format">{count, plural, one {# UTXO} other {# UTXOs}}</string>
780758
<string name="sweep__utxos_format">{count, plural, one {# UTXO seleccionado} other {# UTXOs seleccionados}}</string>
781-
<string name="time__days">{count, plural, one {# día} other {# días}}</string>
782-
<string name="time__hours">{count, plural, one {# hora} other {# horas}}</string>
783-
<string name="time__minutes">{count, plural, one {# minuto} other {# minutos}}</string>
784-
<string name="time__seconds">{count, plural, one {# segundo} other {# segundos}}</string>
785759
<string name="wallet__drawer__activity">Actividad</string>
786760
<string name="wallet__drawer__contacts">Contactos</string>
787761
<string name="wallet__drawer__profile">Perfil</string>

app/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -724,8 +724,6 @@
724724
<string name="slashtags__onboarding_profile1_text">Configurez votre profil public et vos liens, afin que vos contacts Bitkit puissent vous joindre ou vous payer à tout moment et en tout lieu.</string>
725725
<string name="slashtags__profile">Profil</string>
726726
<string name="slashtags__profile_create">Créer un profil</string>
727-
<string name="slashtags__auth_depricated_title">Déclassé</string>
728-
<string name="slashtags__auth_depricated_msg">Slashauth est obsolète. Veuillez utiliser Bitkit Beta.</string>
729727
<string name="sweep__balance_format">%1$s sats</string>
730728
<string name="sweep__checking_description">Veuillez patienter pendant que Bitkit recherche des fonds dans les adresses non prises en charge (Legacy, Nested SegWit et Taproot).</string>
731729
<string name="sweep__checking_loading">RECHERCHE DE FONDS...</string>

app/src/main/res/values-pl/strings.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -756,8 +756,6 @@
756756
<string name="sweep__total">Razem</string>
757757
<string name="sweep__utxo_format">%1$s, %2$d UTXO</string>
758758
<string name="sweep__utxos_format">%1$s, %2$d UTXOs</string>
759-
<string name="slashtags__auth_depricated_title">Przestarzałe</string>
760-
<string name="slashtags__auth_depricated_msg">Slashauth jest przestarzałe. Proszę używać Bitkit Beta.</string>
761759
<string name="wallet__drawer__wallet">Portfel</string>
762760
<string name="wallet__drawer__activity">Aktywność</string>
763761
<string name="wallet__drawer__contacts">Kontakty</string>

0 commit comments

Comments
 (0)