From 2772e178eefb7e1236784a8440ce7a3e67557878 Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Mon, 30 Aug 2021 13:22:03 +0200 Subject: [PATCH] Passcode: only save passcode if correct/empty --- src/PasscodeDialog.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/PasscodeDialog.scala b/src/PasscodeDialog.scala index 85101b7..f50961b 100644 --- a/src/PasscodeDialog.scala +++ b/src/PasscodeDialog.scala @@ -92,12 +92,15 @@ class PasscodeDialog(act : Activity, firstrun : Boolean) extends AlertDialog(act } } + def passOK(call : String, pass : String) = { + if (pass != "") AprsPacket.passcodeAllowed(call, pass, true) else true + } + def verifyInput() { val call = inputCall.getText().toString() val pass = inputPass.getText().toString() val callError = if (call != "" || !movedAwayFromCallsign) null else act.getString(R.string.p_callsign_entry) - val passOK = if (pass != "") AprsPacket.passcodeAllowed(call, pass, true) else true - val passError = if (passOK) null else act.getString(R.string.wrongpasscode) + val passError = if (passOK(call, pass)) null else act.getString(R.string.wrongpasscode) inputCall.setError(callError) inputPass.setError(passError) okButton.setEnabled(call != "" && callError == null && passError == null) @@ -117,7 +120,8 @@ class PasscodeDialog(act : Activity, firstrun : Boolean) extends AlertDialog(act act.finish() return } - pe.putString("passcode", passcode) + if (passOK(call, passcode)) + pe.putString("passcode", passcode) pe.putBoolean("firstrun", !completed) pe.commit() }