Skip to content

Commit 30a8e81

Browse files
committed
Merge branch 'master' into mainnet
2 parents 1f450bd + 97fd055 commit 30a8e81

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ dependencies {
9494
implementation "androidx.appcompat:appcompat:1.1.0"
9595

9696
// ANDROIDX - material
97-
def material_version = "1.2.0-alpha03"
97+
def material_version = "1.2.0-alpha04"
9898
implementation "com.google.android.material:material:$material_version"
9999

100100
// ANDROIDX - navigation
@@ -132,7 +132,7 @@ dependencies {
132132

133133
// eclair core
134134
def libsecp256k1_version = "1.3"
135-
def eclair_version = "0.3.6-android-phoenix-RC1"
135+
def eclair_version = "0.3.6-android-phoenix"
136136
implementation "fr.acinq.bitcoin:secp256k1-jni:$libsecp256k1_version"
137137
implementation("fr.acinq.eclair:eclair-core_2.11:$eclair_version") {
138138
exclude group: 'fr.acinq.bitcoin', module: 'secp256k1-jni'

app/src/main/java/fr/acinq/phoenix/send/ReadInputFragment.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ class ReadInputFragment : BaseFragment() {
7676
log.debug("abort payment to self")
7777
model.readingState.postValue(ReadingState.ERROR)
7878
model.errorMessage.postValue(R.string.scan_error_pay_to_self)
79+
} else if (it.isExpired) {
80+
model.readingState.postValue(ReadingState.ERROR)
81+
model.errorMessage.postValue(R.string.scan_error_expired)
7982
} else if (it.amount().isEmpty && !it.features().allowTrampoline()) {
8083
// Payment request is pre-trampoline and SHOULD specify an amount. Show warning to user.
8184
AlertHelper.build(layoutInflater, Converter.html(getString(R.string.scan_amountless_legacy_title)), Converter.html(getString(R.string.scan_amountless_legacy_message)))

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@
165165
<string name="scan_state_reading">Reading payment request</string>
166166

167167
<string name="scan_error_default">This is not a valid payment request.\n\nPlease try again.</string>
168+
<string name="scan_error_expired">Payment has expired.</string>
168169
<string name="scan_error_pay_to_self">You cannot pay yourself.</string>
169170
<string name="scan_error_invalid_chain">This invoice does not use the same blockchain as your wallet.</string>
170171
<string name="scan_error_lnurl_unsupported">This LNURL is not supported yet!</string>

0 commit comments

Comments
 (0)