Merge branch 'master' into mainnet

Author: dpad85

app/build.gradle

@@ -94,7 +94,7 @@ dependencies {
   implementation "androidx.appcompat:appcompat:1.1.0"
 
   // ANDROIDX - material
-  def material_version = "1.2.0-alpha03"
+  def material_version = "1.2.0-alpha04"
   implementation "com.google.android.material:material:$material_version"
 
   // ANDROIDX - navigation
@@ -132,7 +132,7 @@ dependencies {
 
   // eclair core
   def libsecp256k1_version = "1.3"
-  def eclair_version = "0.3.6-android-phoenix-RC1"
+  def eclair_version = "0.3.6-android-phoenix"
   implementation "fr.acinq.bitcoin:secp256k1-jni:$libsecp256k1_version"
   implementation("fr.acinq.eclair:eclair-core_2.11:$eclair_version") {
     exclude group: 'fr.acinq.bitcoin', module: 'secp256k1-jni'

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

@@ -76,6 +76,9 @@ class ReadInputFragment : BaseFragment() {
               log.debug("abort payment to self")
               model.readingState.postValue(ReadingState.ERROR)
               model.errorMessage.postValue(R.string.scan_error_pay_to_self)
+            } else if (it.isExpired) {
+              model.readingState.postValue(ReadingState.ERROR)
+              model.errorMessage.postValue(R.string.scan_error_expired)
             } else if (it.amount().isEmpty && !it.features().allowTrampoline()) {
               // Payment request is pre-trampoline and SHOULD specify an amount. Show warning to user.
               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

@@ -165,6 +165,7 @@
   <string name="scan_state_reading">Reading payment request</string>
 
   <string name="scan_error_default">This is not a valid payment request.\n\nPlease try again.</string>
+  <string name="scan_error_expired">Payment has expired.</string>
   <string name="scan_error_pay_to_self">You cannot pay yourself.</string>
   <string name="scan_error_invalid_chain">This invoice does not use the same blockchain as your wallet.</string>
   <string name="scan_error_lnurl_unsupported">This LNURL is not supported yet!</string>