Merge branch 'master' into mainnet

Author: dpad85

app/build.gradle

@@ -132,7 +132,7 @@ dependencies {
 
   // eclair core
   def libsecp256k1_version = "1.3"
-  def eclair_version = "0.3.5-android-phoenix"
+  def eclair_version = "0.3.6-android-phoenix-RC1"
   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/MainActivity.kt

@@ -97,6 +97,7 @@ class MainActivity : AppCompatActivity() {
       handleNetworkAlert()
     })
     appKit.navigationEvent.observe(this, Observer {
+      log.info("navigation event @ $it")
       when (it) {
         is PayToOpenRequestEvent -> {
           val action = ReceiveWithOpenDialogFragmentDirections.globalActionAnyToReceiveWithOpen(

app/src/main/java/fr/acinq/phoenix/receive/ReceiveWithOpenDialogFragment.kt

@@ -18,14 +18,14 @@ package fr.acinq.phoenix.receive
 
 import android.content.DialogInterface
 import android.os.Bundle
-import android.os.CountDownTimer
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.activity.addCallback
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.fragment.navArgs
@@ -38,6 +38,8 @@ import fr.acinq.phoenix.databinding.FragmentReceiveWithOpenBinding
 import fr.acinq.phoenix.utils.Converter
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import java.util.*
+import kotlin.math.max
 
 
 open class ReceiveWithOpenDialogFragment : DialogFragment() {
@@ -64,6 +66,14 @@ open class ReceiveWithOpenDialogFragment : DialogFragment() {
       model = ViewModelProvider(this).get(ReceiveWithOpenViewModel::class.java)
       mBinding.model = model
 
+      model.timeToExpiry.observe(viewLifecycleOwner, Observer {
+        mBinding.acceptButton.setText(getString(R.string.receive_with_open_accept, max(it / 1000, 0).toString()))
+        if (it <= 0) {
+          log.info("pay to open with payment_hash=${args.paymentHash} has expired and is declined")
+          appKit.rejectPayToOpen(ByteVector32.fromValidHex(args.paymentHash))
+        }
+      })
+
       activity?.onBackPressedDispatcher?.addCallback(this) {
         log.debug("back pressed disabled here")
       }
@@ -72,18 +82,6 @@ open class ReceiveWithOpenDialogFragment : DialogFragment() {
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-    object : CountDownTimer(30000, 1000) {
-      override fun onTick(millisUntilFinished: Long) {
-        mBinding.acceptButton.setText(getString(R.string.receive_with_open_accept, millisUntilFinished / 1000))
-      }
-
-      override fun onFinish() {
-        log.info("pay to open with payment_hash=${args.paymentHash} has expired and is declined")
-        model.hasExpired.value = true
-        appKit.rejectPayToOpen(ByteVector32.fromValidHex(args.paymentHash))
-      }
-    }.start()
-
     context?.let {
       mBinding.amountValue.text = Converter.printAmountPretty(MilliSatoshi(args.amountMsat), it, withUnit = true)
       mBinding.amountFiat.text = Converter.html(getString(R.string.utils_converted_amount, Converter.printFiatPretty(it, MilliSatoshi(args.amountMsat), withUnit = true)))
@@ -117,15 +115,32 @@ open class ReceiveWithOpenDialogFragment : DialogFragment() {
     appKit.rejectPayToOpen(ByteVector32.fromValidHex(args.paymentHash))
     super.onCancel(dialog)
   }
-
-  override fun onDismiss(dialog: DialogInterface) {
-    super.onDismiss(dialog)
-  }
 }
 
 class ReceiveWithOpenViewModel : ViewModel() {
-  private val log = LoggerFactory.getLogger(ReceiveWithOpenViewModel::class.java)
+  companion object {
+    private const val DEFAULT_TIMEOUT_MILLIS = 30000
+  }
 
+  private val log = LoggerFactory.getLogger(ReceiveWithOpenViewModel::class.java)
+  private val timer: Timer = Timer()
   val showHelp = MutableLiveData(false)
-  val hasExpired = MutableLiveData(false)
+
+  // FIXME: this value should be initialized using an absolute / server defined timestamp in the PayToOpenRequest (not implemented yet).
+  val timeToExpiry = MutableLiveData(DEFAULT_TIMEOUT_MILLIS)
+
+  init {
+    timer.schedule(object : TimerTask() {
+      override fun run() {
+        timeToExpiry.value?.let {
+          timeToExpiry.postValue(max(0, it - 1000))
+        }
+      }
+    }, 0, 1000)
+  }
+
+  override fun onCleared() {
+    super.onCleared()
+    timer.cancel()
+  }
 }

app/src/main/java/fr/acinq/phoenix/utils/Logging.kt

@@ -57,7 +57,7 @@ object Logging {
     lc.getLogger("io.netty").level = if (BuildConfig.DEBUG) Level.INFO else Level.WARN
 
     val root = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as Logger
-    root.level = Level.DEBUG
+    root.level = if (BuildConfig.DEBUG) Level.DEBUG else Level.INFO
     root.addAppender(logcatAppender)
     root.addAppender(localFileAppender)
   }

app/src/main/res/layout/fragment_receive_with_open.xml

@@ -153,7 +153,7 @@
         android:layout_marginEnd="@dimen/space_lg"
         android:text="@string/receive_with_open_cost"
         android:textAlignment="center"
-        android:visibility="@{!model.hasExpired}"
+        android:visibility="@{model.timeToExpiry > 0}"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -175,7 +175,7 @@
         android:padding="@dimen/space_sm"
         android:text="@string/receive_with_open_expired"
         android:textAlignment="center"
-        android:visibility="@{model.hasExpired}"
+        android:visibility="@{model.timeToExpiry <= 0}"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -186,7 +186,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/button_bg_square"
-        android:visibility="@{!model.hasExpired}"
+        android:visibility="@{model.timeToExpiry > 0}"
         app:icon="@drawable/ic_check_circle"
         app:icon_tint="?attr/positiveColor"
         app:layout_constraintTop_toBottomOf="@id/expired"
@@ -205,7 +205,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/button_bg_square"
         android:textAlignment="center"
-        android:visibility="@{model.hasExpired}"
+        android:visibility="@{model.timeToExpiry <= 0}"
         app:icon="@drawable/ic_cross_circle"
         app:layout_constraintTop_toBottomOf="@id/decline_separator"
         app:text="@string/btn_close" />
@@ -215,7 +215,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/button_bg_square"
-        android:visibility="@{!model.hasExpired}"
+        android:visibility="@{model.timeToExpiry > 0}"
         app:icon="@drawable/ic_cross_circle"
         app:layout_constraintTop_toBottomOf="@id/decline_separator"
         app:text="@string/receive_with_open_decline" />

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

@@ -129,9 +129,9 @@
   <string name="receive_with_open_help">In order to receive payments on Lightning, you need to have a channel with enough inbound liquidity.\n\nIf you don\'t have one, Phoenix will automatically create a channel on-the-fly as needed. The setup fee covers the cost of creating the channel and allocating liquidity to it.</string>
   <string name="receive_with_open_amount_label">You have a pending incoming payment of</string>
   <string name="receive_with_open_cost"><![CDATA[Accepting this payment requires a setup fee of <b>%1$s</b> (%2$s).]]></string>
-  <string name="receive_with_open_accept">Accept (expires in %1$ds)</string>
+  <string name="receive_with_open_accept">Accept (expires in %1$ss)</string>
   <string name="receive_with_open_decline">Decline</string>
-  <string name="receive_with_open_expired">Request has expired!</string>
+  <string name="receive_with_open_expired">This payment has expired!</string>
 
   <!-- //////////////// send //////////////// -->
 
@@ -307,7 +307,7 @@
   <string name="inappnotif_mnemonics_never_seen">Thanks for using Phoenix. Have you made a backup of your wallet?</string>
   <string name="inappnotif_mnemonics_never_seen_action">Backup my wallet</string>
   <string name="inappnotif_background_worker_cannot_run">Phoenix needs to be able to run in background from time to time. Make sure your device does not aggressively kill this app for battery savings.</string>
-  <string name="inappnotif_upgrade">A new version of the wallet is available.</string>
+  <string name="inappnotif_upgrade">An update for this app is available.</string>
   <string name="inappnotif_upgrade_critical">A critical update is available. The wallet may malfunction if not updated.</string>
 
   <!-- //////////////// display seed //////////////// -->