diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:16:46 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 03:16:46 +0100 |
commit | b0cb0346c17d4f136cbcc3660ff173584fe2b9c7 (patch) | |
tree | a614b149a06fa336537092fc6d04a6b7d69bad05 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java | |
parent | cf51366bb7863f68989e30dba86a0d2dc1e41ce3 (diff) | |
parent | a41e6e0c705e8c927d1f905fad9b36e810dc5acc (diff) | |
download | open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.tar.gz open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.tar.bz2 open-keychain-b0cb0346c17d4f136cbcc3660ff173584fe2b9c7.zip |
Merge branch 'master' into v/decrypt-key-lookup
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java index 206212387..ae9a2c180 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BackupOperation.java @@ -252,7 +252,7 @@ public class BackupOperation extends BaseOperation<BackupKeyringParcel> { ring.encode(arOutStream); } catch (PgpGeneralException e) { - log.add(LogType.MSG_BACKUP_ERROR_KEY, 2); + log.add(LogType.MSG_UPLOAD_ERROR_IO, 2); } finally { if (arOutStream != null) { arOutStream.close(); @@ -273,7 +273,7 @@ public class BackupOperation extends BaseOperation<BackupKeyringParcel> { ring.encode(arOutStream); } catch (PgpGeneralException e) { - log.add(LogType.MSG_BACKUP_ERROR_KEY, 2); + log.add(LogType.MSG_UPLOAD_ERROR_IO, 2); } finally { if (arOutStream != null) { arOutStream.close(); |