diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-21 15:44:52 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-21 15:44:52 +0200 |
| commit | 4172715064584ef873bcf9c319c08889af3408d3 (patch) | |
| tree | 28154af0b73c4877ce2c901ac8ac2b923dfe48a8 /OpenKeychain/src | |
| parent | 8f565296b9503b210cd8edb8cb9ea42a3055c3c6 (diff) | |
| download | open-keychain-4172715064584ef873bcf9c319c08889af3408d3.tar.gz open-keychain-4172715064584ef873bcf9c319c08889af3408d3.tar.bz2 open-keychain-4172715064584ef873bcf9c319c08889af3408d3.zip | |
re-add accidentally deleted string
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java index e4026eaaf..99d1768b1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/BaseOperation.java @@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.operations; import android.content.Context; import android.os.Parcelable; import android.support.annotation.NonNull; +import android.support.annotation.StringRes; import org.sufficientlysecure.keychain.Constants.key; import org.sufficientlysecure.keychain.operations.results.OperationResult; @@ -81,7 +82,7 @@ public abstract class BaseOperation <T extends Parcelable> implements Passphrase @NonNull public abstract OperationResult execute(T input, CryptoInputParcel cryptoInput); - public void updateProgress(int message, int current, int total) { + public void updateProgress(@StringRes int message, int current, int total) { if (mProgressable != null) { mProgressable.setProgress(message, current, total); } diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 9c2d1a2b0..033eea754 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -435,6 +435,7 @@ <string name="progress_encrypting">"encrypting data…"</string> <string name="progress_decrypting">"decrypting data…"</string> <string name="progress_preparing_signature">"preparing signature…"</string> + <string name="progress_processing_signature">processing signature…</string> <string name="progress_generating_signature">"generating signature…"</string> <string name="progress_verifying_signature">"verifying signature…"</string> <string name="progress_signing">"signing…"</string> |