Merge branch 'develop' into 'master'

godenzim · godenzim · commit 3dbc816d3fec · 2023-02-14T09:37:05.000+01:00
Develop

See merge request papers/airgap/airgap-vault!403
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -37,7 +37,7 @@ android {
     kotlinOptions {
         jvmTarget = '11'
     }
-    lintOptions {
+    lint {
         abortOnError false
     }
 }
@@ -72,7 +72,7 @@ dependencies {
     def fragmentVersion = "1.4.0"
     implementation("androidx.fragment:fragment-ktx:$fragmentVersion")
 
-    def biometricVersion = "1.2.0-alpha04"
+    def biometricVersion = "1.2.0-alpha05"
     implementation("androidx.biometric:biometric:$biometricVersion")
 
     def coroutinesVersion = "1.6.0"
diff --git a/android/app/src/main/java/it/airgap/vault/plugin/securityutils/authprompt/AuthPromptFragment.kt b/android/app/src/main/java/it/airgap/vault/plugin/securityutils/authprompt/AuthPromptFragment.kt
@@ -10,13 +10,16 @@ import androidx.fragment.app.Fragment
 import it.airgap.vault.R
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
+import java.util.concurrent.atomic.AtomicInteger
 
 class AuthPromptFragment : Fragment(R.layout.fragment_authenticator) {
 
     private val _resultDeferred: CompletableDeferred<Boolean> = CompletableDeferred()
     val resultDeferred: Deferred<Boolean>
         get() = _resultDeferred
 
+    private val attempts: AtomicInteger = AtomicInteger(0)
+
     private var _biometricPromptInfo: BiometricPrompt.PromptInfo? = null
     private val biometricPromptInfo: BiometricPrompt.PromptInfo
         get() = _biometricPromptInfo ?: BiometricPrompt.PromptInfo.Builder().apply {
@@ -37,17 +40,21 @@ class AuthPromptFragment : Fragment(R.layout.fragment_authenticator) {
             BiometricPrompt(this, executor, object : BiometricPrompt.AuthenticationCallback() {
                 override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                     super.onAuthenticationError(errorCode, errString)
+                    attempts.set(0)
                     _resultDeferred.complete(false)
                 }
 
                 override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
                     super.onAuthenticationSucceeded(result)
+                    attempts.set(0)
                     _resultDeferred.complete(true)
                 }
 
                 override fun onAuthenticationFailed() {
                     super.onAuthenticationFailed()
-                    _resultDeferred.complete(false)
+                    if (attempts.incrementAndGet() >= MAX_AUTH_TRIES) {
+                        _resultDeferred.complete(false)
+                    }
                 }
             })
         }.also { _biometricPrompt = it }
@@ -64,4 +71,8 @@ class AuthPromptFragment : Fragment(R.layout.fragment_authenticator) {
 
         super.onDestroyView()
     }
+
+    companion object {
+        private const val MAX_AUTH_TRIES = 3
+    }
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -25,6 +25,14 @@ allprojects {
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
+    afterEvaluate {
+        if (getPlugins().hasPlugin('android') ||
+            getPlugins().hasPlugin('android-library')) {
+            configure(android.lint) {
+                abortOnError false
+            }
+        }
+    }
 }
 
 task clean(type: Delete) {
diff --git a/android/variables.gradle b/android/variables.gradle
@@ -1,7 +1,7 @@
 ext {
     minSdkVersion = 22
-    compileSdkVersion = 32
-    targetSdkVersion = 32
+    compileSdkVersion = 33
+    targetSdkVersion = 33
     androidxActivityVersion = '1.4.0'
     androidxAppCompatVersion = '1.4.2'
     androidxCoordinatorLayoutVersion = '1.2.0'
diff --git a/package.json b/package.json
@@ -38,23 +38,23 @@
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.9",
+    "@airgap/aeternity": "0.13.10",
     "@airgap/angular-core": "0.0.34",
     "@airgap/angular-ngrx": "0.0.34",
-    "@airgap/astar": "0.13.9",
-    "@airgap/bitcoin": "0.13.9",
-    "@airgap/coinlib-core": "0.13.9",
-    "@airgap/cosmos": "0.13.9",
-    "@airgap/ethereum": "0.13.9",
-    "@airgap/groestlcoin": "0.13.9",
-    "@airgap/icp": "0.13.9",
-    "@airgap/module-kit": "0.13.9",
-    "@airgap/moonbeam": "0.13.9",
-    "@airgap/polkadot": "0.13.9",
+    "@airgap/astar": "0.13.10",
+    "@airgap/bitcoin": "0.13.10",
+    "@airgap/coinlib-core": "0.13.10",
+    "@airgap/cosmos": "0.13.10",
+    "@airgap/ethereum": "0.13.10",
+    "@airgap/groestlcoin": "0.13.10",
+    "@airgap/icp": "0.13.10",
+    "@airgap/module-kit": "0.13.10",
+    "@airgap/moonbeam": "0.13.10",
+    "@airgap/polkadot": "0.13.10",
     "@airgap/sapling-wasm": "0.0.7",
-    "@airgap/serializer": "0.13.9",
-    "@airgap/substrate": "0.13.9",
-    "@airgap/tezos": "0.13.9",
+    "@airgap/serializer": "0.13.10",
+    "@airgap/substrate": "0.13.10",
+    "@airgap/tezos": "0.13.10",
     "@angular/common": "13.2.5",
     "@angular/core": "13.2.5",
     "@angular/forms": "13.2.5",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -106,7 +106,7 @@ export class AppComponent implements AfterViewInit {
                   const protocol: string = data.url.substr(DEEPLINK_VAULT_ADD_ACCOUNT.length)
                   if (protocol.length > 0) {
                     this.navigationService
-                      .routeWithState('account-add', { protocol })
+                      .routeWithState('account-add', { protocol, secret: secrets[0] })
                       .catch(handleErrorLocal(ErrorCategory.IONIC_NAVIGATION))
                   } else {
                     this.navigationService.route('account-add').catch(handleErrorLocal(ErrorCategory.IONIC_NAVIGATION))
diff --git a/src/app/pages/account-add/account-add.page.ts b/src/app/pages/account-add/account-add.page.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core'
 import { ModalController, AlertController } from '@ionic/angular'
-import { ICoinProtocol, MainProtocolSymbols, ProtocolSymbols } from '@airgap/coinlib-core'
+import { ICoinProtocol, ProtocolSymbols } from '@airgap/coinlib-core'
 
 import { ErrorCategory, handleErrorLocal } from '../../services/error-handler/error-handler.service'
 import { NavigationService } from '../../services/navigation/navigation.service'
@@ -62,9 +62,7 @@ export class AccountAddPage {
     const state = this.navigationService.getState()
     this.secret = state.secret
     this.protocolService.getActiveProtocols().then(async (protocols: ICoinProtocol[]) => {
-      const navigationIdentifier: ProtocolSymbols | undefined = (this.navigationService.getState().protocol)
-        ? await this.navigationService.getState().protocol.getIdentifier()
-        : undefined
+      const navigationIdentifier: ProtocolSymbols | undefined = state.protocol
 
       this.protocolList = await Promise.all(protocols.map(async (protocol) => {
         const [symbol, identifier, name, supportsHD] = await Promise.all([
@@ -73,17 +71,13 @@ export class AccountAddPage {
           protocol.getName(),
           protocol.getSupportsHD()
         ])
+        const isChecked = navigationIdentifier === identifier
 
-        const isChecked =
-          identifier === MainProtocolSymbols.BTC_SEGWIT ||
-          identifier === MainProtocolSymbols.ETH ||
-          navigationIdentifier === identifier
-
-        return { 
-          protocol, 
-          isHDWallet: supportsHD, 
-          customDerivationPath: undefined, 
-          isChecked: isChecked, 
+        return {
+          protocol,
+          isHDWallet: supportsHD,
+          customDerivationPath: undefined,
+          isChecked: isChecked,
           details: { symbol, identifier, name }
         }
       }))
diff --git a/src/app/pages/secret-add/secret-add.page.ts b/src/app/pages/secret-add/secret-add.page.ts
@@ -8,6 +8,7 @@ import { MnemonicSecret } from '../../models/secret'
 import { ErrorCategory, handleErrorLocal } from '../../services/error-handler/error-handler.service'
 import { NavigationService } from '../../services/navigation/navigation.service'
 import { SecretsService } from '../../services/secrets/secrets.service'
+import { UiEventService } from '@airgap/angular-core'
 
 @Component({
   selector: 'airgap-secret-add',
@@ -32,7 +33,8 @@ export class SecretAddPage {
     private readonly navigationService: NavigationService,
     private readonly platform: Platform,
     private readonly lifehashService: LifehashService,
-    private readonly storageService: VaultStorageService
+    private readonly storageService: VaultStorageService,
+    private readonly uiEventService: UiEventService
   ) {
     if (this.navigationService.getState()) {
       this.isGenerating = this.navigationService.getState().isGenerating
@@ -51,8 +53,11 @@ export class SecretAddPage {
     } catch (error) {
       handleErrorLocal(ErrorCategory.SECURE_STORAGE)(error)
 
-      // TODO: Show error
-      this.navigationService.routeToSecretsTab()
+      if (error.message !== 'Already added secret' /* a workaround to avoid prompting 2 alerts */) {
+        await this.showErrorAlert()
+      } else {
+        this.navigationService.routeToSecretsTab()
+      }
       return
     }
 
@@ -62,4 +67,26 @@ export class SecretAddPage {
   public async togglePasscode(): Promise<void> {
     this.secret.isParanoia = !this.secret.isParanoia
   }
+
+  private async showErrorAlert() {
+    const alert = await this.uiEventService.getTranslatedAlert({
+      header: 'secret-edit.error_alert.title',
+      message: 'secret-edit.error_alert.message',
+      backdropDismiss: true,
+      buttons: [
+        {
+          text: 'secret-edit.error_alert.abort-button_label',
+          handler: () => {
+            this.navigationService.routeToSecretsTab()
+          }
+        },
+        {
+          text: 'secret-edit.error_alert.retry-button_label',
+          role: 'cancel'
+        }
+      ]
+    })
+
+    await alert.present().catch(handleErrorLocal(ErrorCategory.IONIC_ALERT))
+  }
 }
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -155,7 +155,13 @@
       "copied": "Recovery key copied",
       "reset-error": "Could not set the recovery key"
     },
-    "confirm_label": "Confirm"
+    "confirm_label": "Confirm",
+    "error_alert": {
+      "title": "Error",
+      "message": "Something went wrong!",
+      "abort-button_label": "Abort",
+      "retry-button_label": "Retry"
+    }
   },
   "secret-service": {
     "alert": {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ android {`
`37`	`37`	`kotlinOptions {`
`38`	`38`	`jvmTarget = '11'`
`39`	`39`	`}`
`40`		`- lintOptions {`
	`40`	`+ lint {`
`41`	`41`	`abortOnError false`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -72,7 +72,7 @@ dependencies {`
`72`	`72`	`def fragmentVersion = "1.4.0"`
`73`	`73`	`implementation("androidx.fragment:fragment-ktx:$fragmentVersion")`
`74`	`74`
`75`		`- def biometricVersion = "1.2.0-alpha04"`
	`75`	`+ def biometricVersion = "1.2.0-alpha05"`
`76`	`76`	`implementation("androidx.biometric:biometric:$biometricVersion")`
`77`	`77`
`78`	`78`	`def coroutinesVersion = "1.6.0"`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,14 @@ allprojects {`
`25`	`25`	`mavenCentral()`
`26`	`26`	`maven { url 'https://jitpack.io' }`
`27`	`27`	`}`
	`28`	`+ afterEvaluate {`
	`29`	`+ if (getPlugins().hasPlugin('android') \|\|`
	`30`	`+ getPlugins().hasPlugin('android-library')) {`
	`31`	`+ configure(android.lint) {`
	`32`	`+ abortOnError false`
	`33`	`+ }`
	`34`	`+ }`
	`35`	`+ }`
`28`	`36`	`}`
`29`	`37`
`30`	`38`	`task clean(type: Delete) {`