mirror
/
aprsdroid
kopia lustrzana https://github.com/ge0rg/aprsdroid
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Passcode: only save passcode if correct/empty

pull/317/head
Georg Lukas 2021-08-30 13:22:03 +02:00
rodzic 9b179dad19
commit 2772e178ee
1 zmienionych plików z 7 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
src/PasscodeDialog.scala
Wyświetl plik

@ -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() { def verifyInput() {
val call = inputCall.getText().toString() val call = inputCall.getText().toString()
val pass = inputPass.getText().toString() val pass = inputPass.getText().toString()
val callError = if (call != "" || !movedAwayFromCallsign) null else act.getString(R.string.p_callsign_entry) 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(call, pass)) null else act.getString(R.string.wrongpasscode)
val passError = if (passOK) null else act.getString(R.string.wrongpasscode)
inputCall.setError(callError) inputCall.setError(callError)
inputPass.setError(passError) inputPass.setError(passError)
okButton.setEnabled(call != "" && callError == null && passError == null) okButton.setEnabled(call != "" && callError == null && passError == null)
@ -117,7 +120,8 @@ class PasscodeDialog(act : Activity, firstrun : Boolean) extends AlertDialog(act
act.finish() act.finish()
return return
} }
pe.putString("passcode", passcode) if (passOK(call, passcode))
pe.putString("passcode", passcode)
pe.putBoolean("firstrun", !completed) pe.putBoolean("firstrun", !completed)
pe.commit() pe.commit()
} }