aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-17 10:36:14 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-17 10:37:03 +0200
commit4885361cd2f7c27a528fcfc5e8eac1cc1a9b50d0 (patch)
tree3684e873c4695b1282ab606dca603db849ab9402 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations
parentb430ba51eb1df64c3386a824fe8fbddcc9c00ece (diff)
downloadopen-keychain-4885361cd2f7c27a528fcfc5e8eac1cc1a9b50d0.tar.gz
open-keychain-4885361cd2f7c27a528fcfc5e8eac1cc1a9b50d0.tar.bz2
open-keychain-4885361cd2f7c27a528fcfc5e8eac1cc1a9b50d0.zip
check fingerprint length after scanning qr code
Fixes #1281
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
index f7b1ca0b4..82f157d4c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
@@ -719,7 +719,8 @@ public abstract class OperationResult implements Parcelable {
MSG_ACC_SAVED (LogLevel.INFO, R.string.api_settings_save_msg),
- MSG_WRONG_QR_CODE (LogLevel.INFO, R.string.import_qr_code_wrong),
+ MSG_WRONG_QR_CODE (LogLevel.ERROR, R.string.import_qr_code_wrong),
+ MSG_WRONG_QR_CODE_FP(LogLevel.ERROR, R.string.import_qr_code_fp),
MSG_NO_VALID_ENC (LogLevel.ERROR, R.string.error_invalid_data),