diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux index 0153a1aaf6..deb1d9818c 100644 --- a/ci/Jenkinsfile.linux +++ b/ci/Jenkinsfile.linux @@ -2,9 +2,9 @@ library 'status-jenkins-lib@v1.3.3' pipeline { agent { - docker { + docker { label 'linux' - image 'statusteam/nim-status-client-build:1.0.3' + image 'statusteam/nim-status-client-build:1.0.4' /* allows jenkins use cat and mounts '/dev/fuse' for linuxdeployqt */ args '--entrypoint="" --cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse' } diff --git a/src/app/keycard/core.nim b/src/app/keycard/core.nim index 773ff8276e..a011ad6d73 100644 --- a/src/app/keycard/core.nim +++ b/src/app/keycard/core.nim @@ -20,7 +20,7 @@ proc delete*(self: KeycardController) = proc reset*(self: KeycardController) = discard -proc attemptOpenSecureChannel(self: KeycardController): bool = +proc attemptOpenSecureChannel(self: KeycardController) : bool = return false proc getCardState(self: KeycardController) = @@ -33,8 +33,10 @@ proc getCardState(self: KeycardController) = self.view.cardState = PreInit elif self.attemptOpenSecureChannel(): self.view.cardState = Paired - else: + elif appInfo.availableSlots > 0: self.view.cardState = Unpaired + else: + self.view.cardState = NoFreeSlots proc init*(self: KeycardController) = discard """ diff --git a/src/app/keycard/view.nim b/src/app/keycard/view.nim index 68c1245c9f..530f4bea65 100644 --- a/src/app/keycard/view.nim +++ b/src/app/keycard/view.nim @@ -11,10 +11,11 @@ type NotKeycard = 1 PreInit = 2 Unpaired = 3 - Paired = 4 - Frozen = 5 - Blocked = 6 - Authenticated = 7 + NoFreeSlots = 4 + Paired = 5 + Frozen = 6 + Blocked = 7 + Authenticated = 8 QtObject: type KeycardView* = ref object of QObject