diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 20:24:24 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-20 20:24:24 +0200 |
commit | ccc1d2e0063a8ab54673eaa5413cb739317c77ee (patch) | |
tree | d26c6931455958dddbc5c923b707f827e0491017 /OpenKeychain/src/main/java/org | |
parent | 735040e19302a99587c5dfd058de7fd0f1db6ef5 (diff) | |
parent | 2cc265390c8710a4a8b250ad84df2466a705336f (diff) | |
download | open-keychain-ccc1d2e0063a8ab54673eaa5413cb739317c77ee.tar.gz open-keychain-ccc1d2e0063a8ab54673eaa5413cb739317c77ee.tar.bz2 open-keychain-ccc1d2e0063a8ab54673eaa5413cb739317c77ee.zip |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index e357db412..f3af51397 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -690,7 +690,7 @@ public class PgpKeyOperation { progress(R.string.progress_modify_subkeyadd, (i-1) * (100 / saveParcel.mAddSubKeys.size())); SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(i); - log.add(LogLevel.INFO, LogType.MSG_MF_SUBKEY_NEW, indent, add.mKeysize, + log.add(LogLevel.INFO, LogType.MSG_MF_SUBKEY_NEW, indent, Integer.toString(add.mKeysize), PgpKeyHelper.getAlgorithmInfo(add.mAlgorithm) ); if (add.mExpiry == null) { |