Merge branch 'master' into mainnet

Author: dpad85

app/build.gradle

@@ -33,8 +33,8 @@ android {
     applicationId "fr.acinq.phoenix.mainnet"
     minSdkVersion 24
     targetSdkVersion 30
-    versionCode 29
-    versionName "1.4.14"
+    versionCode 30
+    versionName "${gitCommitHash}"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildTypes {
@@ -153,7 +153,7 @@ dependencies {
   implementation 'com.github.tony19:logback-android:2.0.0'
 
   // eclair core
-  def eclair_version = "0.4.12-android-phoenix"
+  def eclair_version = "0.4.13-android-phoenix"
   implementation "fr.acinq.secp256k1:secp256k1-kmp-jni-android:0.5.1"
   implementation "fr.acinq.eclair:eclair-core_2.11:$eclair_version"
 

app/src/androidTest/java/fr/acinq/phoenix/LNObjectParserTest.kt

@@ -47,6 +47,7 @@ class LNObjectParserTest {
     // lnurl
     Wallet.parseLNObject("lnurl1dp68gurn8ghj7ctsdyhxcmndv9exket5wvhxxmmd9akxuatjdshkz0m5v9nn6mr0va5kufntxy7kzvfnv5ckxvmzxu6r2enrxscnxc33vvunsdrx8qmnxdfkxa3xgc3sv9jkgctyvgmrxde5xqcr2veh8ymrycf5vvuxydp5vyexgdpexgnxsmtpvv7nwc3cxyuxgdf58qmrsvehvvcxyvmrxvurxc3jx93rsetyvfjnyepn89jxvcmpxccnyvejxe3kxc3cxumxvde5v3jxvc3sxcmrycnxxuj63qyj") as LNUrlAuth
     Wallet.parseLNObject("lightning:LNURL1DP68GURN8GHJ7MRWW4EXCTNZD9NHXATW9EU8J730D3H82UNV94MKJARGV3EXZAELWDJHXUMFDAHR6WPSXU6NYVRRVE3K2VFJX9JXYCF3XA3RZDMPV43NWDPSVCUKXDFHVVEKXDMYXD3XVCN9XSEK2VPHVS6KVERYXUUNJWR9VS6XYCEHX5CQQCJJXZ") as LNUrlWithdraw
+    Wallet.parseLNObject("lnurl:lnurl1dp68gurn8ghj7mrww4exctt5dahkccn00qhxget8wfjk2um0veax2un09e3k7mf0w5lhgct884kx7emfdcnxkvfa8p3nqepjv5cnsdesxdjnxe33x5cngvfev5enxdtzvdnxze33xpjrvwrr8q6k2epkxgux2dnpxe3rgefevg6x2vp4v4nx2d3exenryesuzq939") as LNUrlAuth
     Wallet.parseLNObject("https://service.com/giftcard/redeem?id=123&lightning=LNURL1DP68GURN8GHJ7MRWW4EXCTNZD9NHXATW9EU8J730D3H82UNV94MKJARGV3EXZAELWDJHXUMFDAHR6WPSXU6NYVRRVE3K2VFJX9JXYCF3XA3RZDMPV43NWDPSVCUKXDFHVVEKXDMYXD3XVCN9XSEK2VPHVS6KVERYXUUNJWR9VS6XYCEHX5CQQCJJXZ") as LNUrlWithdraw
     Wallet.parseLNObject("http://foo.bar?lightning=LNURL1DP68GURN8GHJ7MRWW4EXCTNZD9NHXATW9EU8J730D3H82UNV94KX7EMFDCLHGCT884KX7EMFDCNXKVFAX5CRGCFJXANRWVN9VSUK2WTPVF3NXVP4V93KXD3HVS6RWVTZXY6NWVEHV5CNQCFN893RJWF4V9NRQVM9XANRYVR9X4NXGETY8Q6KYDC0Q6NTC") as LNUrlAuth
     Wallet.parseLNObject("foobar://test?lightning=LNURL1DP68GURN8GHJ7MRWW4EXCTNZD9NHXATW9EU8J730D3H82UNV94MKJARGV3EXZAELWDJHXUMFDAHR6WPNXF3KGVFN89JNZENPVY6NSVRP8QCKZCEKVCCRGCTPXY6RJVT9XGMK2DPE893KZEPJXE3RGVFKXYUNWV3EVV6R2DRPXG6RWWP5VDSSSQSUZT") as LNUrlWithdraw

app/src/main/AndroidManifest.xml

@@ -58,6 +58,7 @@
 
         <data android:scheme="bitcoin" />
         <data android:scheme="lightning" />
+        <data android:scheme="lnurl" />
       </intent-filter>
     </activity>
 

app/src/main/java/fr/acinq/phoenix/MainActivity.kt

@@ -136,7 +136,7 @@ class MainActivity : AppCompatActivity() {
     log.debug("reading URI intent=$intent with data=$data")
     if (data != null && data.scheme != null) {
       when (data.scheme) {
-        "bitcoin", "lightning" -> {
+        "bitcoin", "lightning", "lnurl" -> {
           app.currentURIIntent.value = data.toString()
         }
         else -> log.info("unhandled payment scheme $data")

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

@@ -17,23 +17,27 @@
 package fr.acinq.phoenix.send
 
 import android.Manifest
+import android.app.Activity
 import android.app.AlertDialog
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.graphics.BitmapFactory
+import android.net.Uri
 import android.os.Bundle
-import android.os.Handler
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import com.google.common.base.Strings
-import com.google.zxing.BarcodeFormat
-import com.google.zxing.ResultPoint
+import com.google.zxing.*
 import com.google.zxing.client.android.Intents
+import com.google.zxing.common.HybridBinarizer
+import com.google.zxing.multi.qrcode.QRCodeMultiReader
 import com.journeyapps.barcodescanner.BarcodeCallback
 import com.journeyapps.barcodescanner.BarcodeResult
 import fr.acinq.eclair.payment.PaymentRequest
@@ -46,9 +50,14 @@ import fr.acinq.phoenix.lnurl.LNUrlPay
 import fr.acinq.phoenix.lnurl.LNUrlWithdraw
 import fr.acinq.phoenix.utils.*
 import fr.acinq.phoenix.utils.customviews.ButtonView
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
+
 class ReadInputFragment : BaseFragment() {
 
   override val log: Logger = LoggerFactory.getLogger(this::class.java)
@@ -91,8 +100,6 @@ class ReadInputFragment : BaseFragment() {
           mBinding.scanView.pause()
         }
         is ReadInputState.Done.Lightning -> {
-          // check payment request chain
-          val acceptedPrefix = PaymentRequest.prefixes().get(Wallet.getChainHash())
           // additional controls
           if (app.state.value?.getNodeId() == it.pr.nodeId()) {
             log.debug("abort payment to self")
@@ -170,6 +177,13 @@ class ReadInputFragment : BaseFragment() {
       context?.let { model.readInput(ClipboardHelper.read(it)) }
     }
 
+    mBinding.browseButton.setOnClickListener {
+      startActivityForResult(Intent(Intent.ACTION_GET_CONTENT).apply {
+        addCategory(Intent.CATEGORY_OPENABLE)
+        type = "image/*"
+      }, Constants.INTENT_PICK_IMAGE_FILE)
+    }
+
     mBinding.cancelButton.setOnClickListener { findNavController().popBackStack() }
 
     mBinding.errorButton.setOnClickListener {
@@ -202,6 +216,13 @@ class ReadInputFragment : BaseFragment() {
     mBinding.scanView.pause()
   }
 
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    super.onActivityResult(requestCode, resultCode, data)
+    if (requestCode == Constants.INTENT_PICK_IMAGE_FILE && resultCode == Activity.RESULT_OK) {
+      readBitmap(data?.data)
+    }
+  }
+
   private fun startScanning() {
     if (model.inputState.value is ReadInputState.Error || model.inputState.value is ReadInputState.Done) {
       model.inputState.postValue(ReadInputState.Scanning)
@@ -224,4 +245,25 @@ class ReadInputFragment : BaseFragment() {
     }
   }
 
+  private fun readBitmap(uri: Uri?) {
+    lifecycleScope.launch(Dispatchers.IO + CoroutineExceptionHandler { _, e ->
+      log.error("failed to load or read QR code image from uri=$uri: ", e)
+      model.inputState.postValue(ReadInputState.Error.UnhandledInput)
+    }) {
+      val bitmap = requireContext().contentResolver.openFileDescriptor(uri!!, "r")?.use {
+        BitmapFactory.decodeFileDescriptor(it.fileDescriptor)
+      }!!
+      val pixels = IntArray(bitmap.width * bitmap.height)
+      bitmap.getPixels(pixels, 0, bitmap.width, 0, 0, bitmap.width, bitmap.height)
+      val binaryBitmap = BinaryBitmap(HybridBinarizer(RGBLuminanceSource(bitmap.width, bitmap.height, pixels)))
+      val result = QRCodeMultiReader().decodeMultiple(
+        binaryBitmap
+      )
+      log.info("successfully read QR code with result=$result")
+      withContext(Dispatchers.Main) {
+        model.readInput(result.first().text)
+      }
+    }
+  }
+
 }

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

@@ -45,6 +45,7 @@ object Constants {
 
   // -- intents
   const val INTENT_CAMERA_PERMISSION_REQUEST = 1
+  const val INTENT_PICK_IMAGE_FILE = 2
 
   // -- android notifications
   const val DELAY_BEFORE_BACKGROUND_WARNING = DateUtils.DAY_IN_MILLIS * 5

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

@@ -110,6 +110,8 @@ object Wallet {
     return when {
       trimmed.startsWith("lightning://", true) -> trimmed.drop(12)
       trimmed.startsWith("lightning:", true) -> trimmed.drop(10)
+      trimmed.startsWith("lnurl://", true) -> trimmed.drop(8)
+      trimmed.startsWith("lnurl:", true) -> trimmed.drop(6)
       else -> trimmed
     }
   }
@@ -135,7 +137,7 @@ object Wallet {
         try {
           val uri = URI(input)
           if (uri.scheme != null) {
-            uri.getParams()["lightning"] ?: throw RuntimeException("not a valid LNURL fallback scheme")
+            uri.getParams()["lightning"] ?: throw RuntimeException("uri does not contain a valid LNURL fallback")
           } else {
             input
           }.let { LNUrl.extractLNUrl(it) }

app/src/main/res/drawable/ic_image.xml

@@ -0,0 +1,43 @@
+<!--
+  ~ Copyright 2021 ACINQ SAS
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="@dimen/button_height"
+  android:height="@dimen/button_height"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M5,3L19,3A2,2 0,0 1,21 5L21,19A2,2 0,0 1,19 21L5,21A2,2 0,0 1,3 19L3,5A2,2 0,0 1,5 3z"
+    android:strokeWidth="2"
+    android:strokeColor="?attr/textColor"
+    android:strokeLineCap="round"
+    android:strokeLineJoin="round" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M8.5,8.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+    android:strokeWidth="1"
+    android:strokeColor="?attr/textColor"
+    android:strokeLineCap="round"
+    android:strokeLineJoin="round" />
+  <path
+    android:fillColor="#00000000"
+    android:pathData="M21,15l-5,-5l-11,11"
+    android:strokeWidth="2"
+    android:strokeColor="?attr/textColor"
+    android:strokeLineCap="round"
+    android:strokeLineJoin="round" />
+</vector>

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

@@ -46,25 +46,42 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/button_bg_square"
-        android:padding="@dimen/space_md_p"
+        android:padding="@dimen/space_md"
         app:enableOrFade="@{model.inputState instanceof ReadInputState.Scanning}"
         app:icon="@drawable/ic_clipboard"
         app:layout_constraintTop_toTopOf="parent"
         app:text="@string/send_init_paste" />
 
       <View
-        android:id="@+id/sep"
+        android:id="@+id/sep_paste"
         style="@style/HLineSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/paste_button" />
 
+      <fr.acinq.phoenix.utils.customviews.ButtonView
+        android:id="@+id/browse_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/button_bg_square"
+        android:padding="@dimen/space_md"
+        app:enableOrFade="@{model.inputState instanceof ReadInputState.Scanning}"
+        app:icon="@drawable/ic_image"
+        app:layout_constraintTop_toBottomOf="@id/sep_paste"
+        app:text="@string/send_init_browse" />
+
+      <View
+        android:id="@+id/sep_browse"
+        style="@style/HLineSeparator"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/browse_button" />
+
       <fr.acinq.phoenix.utils.customviews.ButtonView
         android:id="@+id/cancel_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/button_bg_square"
-        android:padding="@dimen/space_md_p"
-        app:layout_constraintTop_toBottomOf="@id/sep"
+        android:padding="@dimen/space_md"
+        app:layout_constraintTop_toBottomOf="@id/sep_browse"
         app:text="@string/btn_cancel" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>