Merge branch 'master' into mainnet

ACINQ · Jan 14, 2021 · ba8debb · ba8debb
2 parents f1dc438 + 67e5a97
commit ba8debb
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 20 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -30,7 +30,7 @@ RUN git clone https://github.com/ACINQ/eclair -b $(cat eclair-core-version.txt)
 RUN cd eclair && mvn install -pl eclair-core -am -Dmaven.test.skip=true
 
 # main build image
-FROM ubuntu:19.10
+FROM ubuntu:20.10
 
 ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8

diff --git a/app/build.gradle b/app/build.gradle
@@ -32,8 +32,8 @@ android {
     applicationId "fr.acinq.phoenix.mainnet"
     minSdkVersion 24
     targetSdkVersion 30
-    versionCode 19
-    versionName "1.4.4"
+    versionCode 20
+    versionName "1.4.5-RC"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
   buildTypes {
@@ -97,16 +97,16 @@ dependencies {
   implementation "androidx.appcompat:appcompat:1.2.0"
 
   // ANDROIDX - material
-  def material_version = "1.3.0-alpha03"
+  def material_version = "1.3.0-beta01"
   implementation "com.google.android.material:material:$material_version"
 
   // ANDROIDX - navigation
-  def nav_version = "2.3.0"
+  def nav_version = "2.3.2"
   implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
   implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
   // ANDROIDX - constraint layout
-  def constraint_version = "2.0.2"
+  def constraint_version = "2.0.4"
   implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
 
   // ANDROIDX - viewmodel + livedata
@@ -117,7 +117,7 @@ dependencies {
   implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
   // ANDROIDX - biometric
-  def biometric_version = "1.1.0-beta01"
+  def biometric_version = "1.1.0-rc01"
   implementation "androidx.biometric:biometric:$biometric_version"
 
   // ANDROIDX - preferences
@@ -135,15 +135,15 @@ dependencies {
   implementation "androidx.viewpager2:viewpager2:$view_pager_version"
 
   // SQLDelight
-  implementation "com.squareup.sqldelight:android-driver:1.4.3"
+  implementation "com.squareup.sqldelight:android-driver:1.4.4"
 
   // logging
-  implementation 'org.slf4j:slf4j-api:1.7.29'
+  implementation 'org.slf4j:slf4j-api:1.7.30'
   implementation 'com.github.tony19:logback-android:2.0.0'
 
   // eclair core
   def libsecp256k1_version = "1.3"
-  def eclair_version = "0.4.6-android-phoenix"
+  def eclair_version = "0.4.7-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'
@@ -159,7 +159,7 @@ dependencies {
 
   // tests
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-  testImplementation 'junit:junit:4.13'
+  testImplementation 'junit:junit:4.13.1'
   androidTestImplementation 'androidx.test:runner:1.3.0'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 

diff --git a/app/src/main/java/fr/acinq/phoenix/initwallet/InitWalletFragment.kt b/app/src/main/java/fr/acinq/phoenix/initwallet/InitWalletFragment.kt
@@ -17,13 +17,15 @@
 package fr.acinq.phoenix.initwallet
 
 import android.os.Bundle
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import fr.acinq.phoenix.R
 import fr.acinq.phoenix.databinding.FragmentInitWalletBinding
+import fr.acinq.phoenix.utils.Converter
 import fr.acinq.phoenix.utils.Prefs
 import fr.acinq.phoenix.utils.Wallet
 
@@ -34,6 +36,8 @@ class InitWalletFragment : Fragment() {
 
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
     mBinding = FragmentInitWalletBinding.inflate(inflater, container, false)
+    mBinding.terms.text = Converter.html(getString(R.string.initwallet_terms))
+    mBinding.terms.movementMethod = LinkMovementMethod.getInstance()
     return mBinding.root
   }
 

diff --git a/app/src/main/java/fr/acinq/phoenix/settings/AboutFragment.kt b/app/src/main/java/fr/acinq/phoenix/settings/AboutFragment.kt
@@ -16,6 +16,8 @@
 
 package fr.acinq.phoenix.settings
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
@@ -50,6 +52,7 @@ class AboutFragment : BaseFragment() {
     mBinding.fiatRates.movementMethod = LinkMovementMethod.getInstance()
     mBinding.actionBar.setSubtitle(getString(R.string.about_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE))
     mBinding.actionBar.setOnBackAction { findNavController().popBackStack() }
+    mBinding.terms.setOnClickListener { startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("https://phoenix.acinq.co/terms"))) }
   }
 
 }
diff --git a/app/src/main/res/layout/fragment_init_wallet.xml b/app/src/main/res/layout/fragment_init_wallet.xml
@@ -74,6 +74,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+      <TextView
+        android:id="@+id/terms"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/space_md"
+        android:textSize="@dimen/text_md"
+        android:textAlignment="center"
+        android:text="@string/initwallet_terms"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintWidth_max="@dimen/max_width_sm" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
   </ScrollView>
 </layout>
diff --git a/app/src/main/res/layout/fragment_settings_about.xml b/app/src/main/res/layout/fragment_settings_about.xml
@@ -65,6 +65,13 @@
           android:text="@string/about_fiat_rates"
           app:layout_constraintTop_toBottomOf="@id/general" />
 
+        <fr.acinq.phoenix.utils.customviews.ButtonView
+          android:id="@+id/terms"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          app:layout_constraintTop_toBottomOf="@id/fiat_rates"
+          app:text="@string/about_terms" />
+
       </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
   </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -303,6 +303,9 @@
 
   <!-- //////////////// init wallet //////////////// -->
 
+  <string name="initwallet_terms"><![CDATA[
+    En procédant aux étapes suivantes, vous acceptez les <a href="https://phoenix.acinq.co/terms">conditions d\'utilisation de l\'application</a>.
+  ]]></string>
   <string name="initwallet_create">Créer un nouveau portefeuille</string>
   <string name="initwallet_restore">Restaurer un portefeuille existant</string>
 
@@ -546,6 +549,7 @@
   <br/><br/>
   Si vous avez des questions, consultez <a href="https://phoenix.acinq.co/faq">la FAQ</a>. Vous pouvez aussi contacter <a href="https://phoenix.acinq.co/support">le support</a> si vous avez besoin d\'aide.
   ]]></string>
+  <string name="about_terms">Conditions d\'utilisation</string>
 
   <!-- //////////////// settings: options for payments //////////////// -->
 

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -581,15 +581,15 @@
   <br/><br/>
   É um software livre de código aberto, desenvolvido pela <a href="https://phoenix.acinq.co">ACINQ</a> sob a <a href="https://www.apache.org/licenses/LICENSE-2.0.txt">Licença Apache 2.0</a>.
   <br/><br/>
-  Observe que esta carteira é do tipo não custodiante: <strong>significa que somente você tem acesso as 12 palavras da carteira, também conhecida como seed</strong>. Não forneça a seed para ninguém, e tome cuidado com ataques phishing.
+  Observe que esta carteira é do tipo não custodiante: <strong>significa que somente você tem acesso as 12 palavras da carteira, também conhecida como seed</strong>. Não forneça a seed para ninguém e tome cuidado com ataques phishing.
   <br/><br/>
   Se você tiver alguma dúvida, consulte o <a href="https://phoenix.acinq.co/faq">FAQ</a>. Você também pode entrar em contato com o <a href="https://phoenix.acinq.co/support">suporte</a> para ajuda.
   ]]></string>
   <string name="about_fiat_rates"><![CDATA[
-    As cotações de Bitcoin/Moeda fiduciária são obtidas de várias APIs de terceiros::
+    As cotações de Bitcoin/Moeda fiduciária são obtidas de várias APIs de terceiros:
     <br />- Blockchain.info
     <br />- Bitso
-    <br />- <a href="https://www.coindesk.com/price/bitcoin">Powered by Coindesk</a>
+    <br />- <a href="https://www.coindesk.com/price/bitcoin">Distribuído por Coindesk</a>
   ]]></string>
 
   <!-- //////////////// background node service //////////////// -->
@@ -608,7 +608,7 @@
   <string name="paymentsettings_defaultdesc_dialog_hint">Insira uma descrição</string>
 
   <string name="paymentsettings_paytoopen_auto_title">Permitir abertura de canais de forma automática</string>
-  <string name="paymentsettings_paytoopen_auto_desc">Às vezes é necessário abrir um novo canal de pagamento Lightning para receber um pagamento.\n\nNestes casos, uma taxa de %1$s%% é deduzida do valor recebido para cobrir os custos de abertura do canal.</string>
+  <string name="paymentsettings_paytoopen_auto_desc">Às vezes é necessário abrir um novo canal Lightning para receber um pagamento.\n\nNestes casos, uma taxa de %1$s%% é deduzida do valor recebido para cobrir os custos de abertura do canal.</string>
   <string name="paymentsettings_paytoopen_dialog_title">Você tem certeza?</string>
   <string name="paymentsettings_paytoopen_dialog_description">O aplicativo irá abrir automaticamente canais quando necessário para receber um pagamento.\n\nObserve que uma taxa de %1$s%% é deduzida do valor recebido para cobrir o custo de abertura do canal.</string>
 
@@ -651,4 +651,9 @@
     <p>Ir para Configurações > Segurança para ativar o novo recurso de bloqueio de tela.</p>
   ]]></string>
 
+  <string name="paymentmode_onchain">Pagar usando a rede Bitcoin</string>
+  <string name="paymentmode_onchain_desc">Transações na rede Bitcoin geralmente são mais lentas e mais caras</string>
+  <string name="paymentmode_lightning">Pagar usando a rede Lightning</string>
+  <string name="paymentmode_lightning_desc">Esta é a opção recomendada</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -327,6 +327,9 @@
 
   <!-- //////////////// init wallet //////////////// -->
 
+  <string name="initwallet_terms"><![CDATA[
+    By proceeding to the next steps, you agree to the <a href="https://phoenix.acinq.co/terms">terms of usage</a>.
+  ]]></string>
   <string name="initwallet_create">Create new wallet</string>
   <string name="initwallet_restore">Restore my wallet</string>
 
@@ -591,6 +594,7 @@
     <br />- Bitso
     <br />- <a href="https://www.coindesk.com/price/bitcoin">Powered by Coindesk</a>
   ]]></string>
+  <string name="about_terms">Terms of usage</string>
 
   <!-- //////////////// background node service //////////////// -->
 

diff --git a/build.gradle b/build.gradle
@@ -17,20 +17,20 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-  ext.kotlin_version = '1.4.10'
+  ext.kotlin_version = '1.4.21'
   ext.safeargs_version = '2.1.0-beta02'
   repositories {
     google()
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.0.2'
+    classpath 'com.android.tools.build:gradle:4.1.1'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     // plugin to generate args classes for the androidx navigation component
     classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$safeargs_version"
     // plugin for firebase cloud messaging
     classpath "com.google.gms:google-services:4.3.4"
-    classpath 'com.squareup.sqldelight:gradle-plugin:1.4.3'
+    classpath 'com.squareup.sqldelight:gradle-plugin:1.4.4'
   }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 10 18:34:26 CEST 2020
+#Thu Jan 14 11:57:53 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip