From c50a16945772237d8ba913194a28f59551453dc4 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Mon, 21 Mar 2022 12:05:59 +0100 Subject: [PATCH] ssh: fix crash if there are two ssh doors --- app/src/main/java/app/trigger/MainActivity.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/app/trigger/MainActivity.java b/app/src/main/java/app/trigger/MainActivity.java index 3d60dadc..2f4d4c3b 100644 --- a/app/src/main/java/app/trigger/MainActivity.java +++ b/app/src/main/java/app/trigger/MainActivity.java @@ -465,15 +465,13 @@ private boolean checkSshPassphrase(Setup setup, Action action) { // try other passphrases for (Setup s : Settings.getSetups()) { if (s instanceof SshDoorSetup) { - continue; - } - - SshDoorSetup ss = (SshDoorSetup) s; - if (ss.needsPassphrase() && !Utils.isEmpty(ss.passphrase_tmp)) { - if (SshRequestHandler.testPassphrase(door.keypair, ss.passphrase_tmp)) { - showMessage("Reuse passphrase from " + door.getName()); - door.passphrase_tmp = ss.passphrase_tmp; - return true; + SshDoorSetup ss = (SshDoorSetup) s; + if (ss.needsPassphrase() && !Utils.isEmpty(ss.passphrase_tmp)) { + if (SshRequestHandler.testPassphrase(door.keypair, ss.passphrase_tmp)) { + showMessage("Reuse passphrase from " + door.getName()); + door.passphrase_tmp = ss.passphrase_tmp; + return true; + } } } }