From 36ef8a9a62f32f0843c9e317d493a7f136624dce Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 14 Sep 2014 01:14:58 +0200 Subject: work on OperationResultParcel --- .../keychain/pgp/PgpDecryptVerify.java | 6 +- .../keychain/pgp/PgpImportExport.java | 6 +- .../keychain/pgp/PgpKeyOperation.java | 10 +- .../keychain/pgp/PgpSignEncrypt.java | 8 +- .../keychain/pgp/UncachedKeyRing.java | 7 +- .../keychain/provider/ProviderHelper.java | 6 +- .../keychain/remote/OpenPgpService.java | 3 +- .../remote/ui/AccountSettingsActivity.java | 14 +- .../remote/ui/AccountSettingsFragment.java | 6 +- .../keychain/remote/ui/AppSettingsActivity.java | 6 +- .../keychain/service/KeychainIntentService.java | 12 +- .../service/results/ConsolidateResult.java | 2 +- .../service/results/DecryptVerifyResult.java | 2 +- .../keychain/service/results/EditKeyResult.java | 2 +- .../keychain/service/results/ImportKeyResult.java | 4 +- .../keychain/service/results/OperationResult.java | 594 ++++++++++++++++++++ .../service/results/OperationResultParcel.java | 602 --------------------- .../service/results/SaveKeyringResult.java | 2 +- .../service/results/SignEncryptResult.java | 5 +- .../keychain/service/results/SingletonResult.java | 2 +- .../keychain/ui/CertifyKeyFragment.java | 21 +- .../keychain/ui/CreateKeyFinalFragment.java | 8 +- .../keychain/ui/EditKeyFragment.java | 14 +- .../keychain/ui/ImportKeysActivity.java | 4 +- .../keychain/ui/KeyListActivity.java | 8 +- .../keychain/ui/LogDisplayFragment.java | 12 +- .../keychain/ui/ViewKeyActivity.java | 6 +- OpenKeychain/src/main/res/values/strings.xml | 7 +- 28 files changed, 686 insertions(+), 693 deletions(-) create mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java delete mode 100644 OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java (limited to 'OpenKeychain/src/main') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index 6e59a3b9b..58ca2b54a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -49,9 +49,9 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.service.results.DecryptVerifyResult; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.OperationLog; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.ProgressScaler; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java index 06415cf8a..1c994dceb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java @@ -33,9 +33,9 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.service.KeychainIntentService; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.OperationLog; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.service.results.ImportKeyResult; import org.sufficientlysecure.keychain.service.results.SaveKeyringResult; import org.sufficientlysecure.keychain.util.IterableIterator; 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 ad592a3e9..4ee4ac74c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -46,10 +46,10 @@ import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; import org.spongycastle.openpgp.operator.jcajce.JcePBESecretKeyEncryptorBuilder; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.OperationLog; +import org.sufficientlysecure.keychain.service.results.OperationResult; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.service.results.EditKeyResult; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; @@ -949,7 +949,7 @@ public class PgpKeyOperation { progress(R.string.progress_done, 100); log.add(LogLevel.OK, LogType.MSG_MF_SUCCESS, indent); - return new EditKeyResult(OperationResultParcel.RESULT_OK, log, new UncachedKeyRing(sKR)); + return new EditKeyResult(OperationResult.RESULT_OK, log, new UncachedKeyRing(sKR)); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java index a81fa1a5a..e4ed740a5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java @@ -36,9 +36,9 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.OperationLog; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.service.results.SignEncryptResult; import org.sufficientlysecure.keychain.util.InputData; import org.sufficientlysecure.keychain.util.Log; @@ -367,7 +367,7 @@ public class PgpSignEncrypt { KeyRings.buildUnifiedKeyRingUri(id)); CanonicalizedPublicKey key = keyRing.getEncryptionSubKey(); cPk.addMethod(key.getPubKeyEncryptionGenerator()); - log.add(LogLevel.DEBUG, LogType.MSG_SE_KEY_OK, indent +1, + log.add(LogLevel.DEBUG, LogType.MSG_SE_KEY_OK, indent + 1, PgpKeyHelper.convertKeyIdToHex(id)); } catch (PgpGeneralException e) { log.add(LogLevel.WARN, LogType.MSG_SE_KEY_WARN, indent +1, diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java index d64c3ea55..c76ecbfab 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java @@ -34,12 +34,11 @@ import org.spongycastle.openpgp.PGPSignatureList; import org.spongycastle.openpgp.PGPUtil; import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; import org.spongycastle.util.Strings; -import org.spongycastle.util.encoders.Hex; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.OperationLog; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.util.IterableIterator; import org.sufficientlysecure.keychain.util.Log; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index 8e6a0dfa5..d2540a97d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -55,9 +55,9 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.Keys; import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds; import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.remote.AppSettings; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.OperationLog; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.service.results.ConsolidateResult; import org.sufficientlysecure.keychain.service.results.SaveKeyringResult; import org.sufficientlysecure.keychain.util.ParcelableFileCache; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 29f888a82..a26ee009a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -32,7 +32,6 @@ import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.util.OpenPgpApi; import org.sufficientlysecure.keychain.nfc.NfcActivity; import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; import org.sufficientlysecure.keychain.service.results.DecryptVerifyResult; @@ -45,7 +44,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.ui.RemoteServiceActivity; import org.sufficientlysecure.keychain.service.PassphraseCacheService; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogEntryParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogEntryParcel; import org.sufficientlysecure.keychain.service.results.SignEncryptResult; import org.sufficientlysecure.keychain.ui.ImportKeysActivity; import org.sufficientlysecure.keychain.ui.ViewKeyActivity; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java index 4bf750121..231b26409 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java @@ -30,7 +30,10 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.ActionBarHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.AccountSettings; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.SingletonResult; import org.sufficientlysecure.keychain.util.Log; public class AccountSettingsActivity extends ActionBarActivity { @@ -105,9 +108,10 @@ public class AccountSettingsActivity extends ActionBarActivity { private void save() { new ProviderHelper(this).updateApiAccount(mAccountUri, mAccountSettingsFragment.getAccSettings()); // TODO: show "account saved" instead of "operation succeeded" - OperationResultParcel result = new OperationResultParcel(OperationResultParcel.RESULT_OK, null); + SingletonResult result = new SingletonResult( + SingletonResult.RESULT_OK, LogLevel.OK, LogType.MSG_ACC_SAVED); Intent intent = new Intent(); - intent.putExtra(OperationResultParcel.EXTRA_RESULT, result); + intent.putExtra(SingletonResult.EXTRA_RESULT, result); setResult(RESULT_OK, intent); finish(); } @@ -115,8 +119,8 @@ public class AccountSettingsActivity extends ActionBarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // if a result has been returned, display a notify - if (data != null && data.hasExtra(OperationResultParcel.EXTRA_RESULT)) { - OperationResultParcel result = data.getParcelableExtra(OperationResultParcel.EXTRA_RESULT); + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); result.createNotify(this).show(); } else { super.onActivityResult(requestCode, resultCode, data); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java index d21d83574..a7eb58377 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java @@ -33,7 +33,7 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.remote.AccountSettings; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.service.results.SaveKeyringResult; import org.sufficientlysecure.keychain.ui.CreateKeyActivity; import org.sufficientlysecure.keychain.ui.adapter.KeyValueSpinnerAdapter; @@ -171,8 +171,8 @@ public class AccountSettingsFragment extends Fragment { switch (requestCode) { case REQUEST_CODE_CREATE_KEY: { if (resultCode == Activity.RESULT_OK) { - if (data != null && data.hasExtra(OperationResultParcel.EXTRA_RESULT)) { - SaveKeyringResult result = data.getParcelableExtra(OperationResultParcel.EXTRA_RESULT); + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + SaveKeyringResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); mSelectKeySpinner.setSelectedKeyId(result.mRingMasterKeyId); } else { Log.e(Constants.TAG, "missing result!"); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java index 8cc05231e..1c1978fe9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java @@ -32,7 +32,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.remote.AppSettings; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.util.Log; public class AppSettingsActivity extends ActionBarActivity { @@ -158,8 +158,8 @@ public class AppSettingsActivity extends ActionBarActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // if a result has been returned, display a notify - if (data != null && data.hasExtra(OperationResultParcel.EXTRA_RESULT)) { - OperationResultParcel result = data.getParcelableExtra(OperationResultParcel.EXTRA_RESULT); + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); result.createNotify(this).show(); } else { super.onActivityResult(requestCode, resultCode, data); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java index f012d9a79..52638f592 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java @@ -55,10 +55,10 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingData; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainDatabase; import org.sufficientlysecure.keychain.provider.ProviderHelper; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.OperationLog; +import org.sufficientlysecure.keychain.service.results.OperationResult; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog; import org.sufficientlysecure.keychain.service.results.ConsolidateResult; import org.sufficientlysecure.keychain.service.results.EditKeyResult; import org.sufficientlysecure.keychain.service.results.ImportKeyResult; @@ -813,9 +813,9 @@ public class KeychainIntentService extends IntentService implements Progressable } } - private void sendMessageToHandler(Integer arg1, OperationResultParcel data) { + private void sendMessageToHandler(Integer arg1, OperationResult data) { Bundle bundle = new Bundle(); - bundle.putParcelable(OperationResultParcel.EXTRA_RESULT, data); + bundle.putParcelable(OperationResult.EXTRA_RESULT, data); sendMessageToHandler(arg1, null, bundle); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java index 31f4cabc3..44177563f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java @@ -18,7 +18,7 @@ package org.sufficientlysecure.keychain.service.results; -public class ConsolidateResult extends OperationResultParcel { +public class ConsolidateResult extends OperationResult { public ConsolidateResult(int result, OperationLog log) { super(result, log); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java index 7339f1306..18533ffe6 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/DecryptVerifyResult.java @@ -23,7 +23,7 @@ import android.os.Parcel; import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpSignatureResult; -public class DecryptVerifyResult extends OperationResultParcel { +public class DecryptVerifyResult extends OperationResult { // the fourth bit indicates a "data pending" result! (it's also a form of non-success) public static final int RESULT_PENDING = RESULT_ERROR +8; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/EditKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/EditKeyResult.java index 169ed9f36..9385afd8e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/EditKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/EditKeyResult.java @@ -23,7 +23,7 @@ import android.os.Parcel; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.UncachedKeyRing; -public class EditKeyResult extends OperationResultParcel { +public class EditKeyResult extends OperationResult { private transient UncachedKeyRing mRing; public final long mRingMasterKeyId; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java index 62b5b1b52..ec9c424cf 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java @@ -34,7 +34,7 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.ui.LogDisplayActivity; import org.sufficientlysecure.keychain.ui.LogDisplayFragment; -public class ImportKeyResult extends OperationResultParcel { +public class ImportKeyResult extends OperationResult { public final int mNewKeys, mUpdatedKeys, mBadKeys, mSecret; @@ -109,7 +109,7 @@ public class ImportKeyResult extends OperationResultParcel { int duration, color; // Not an overall failure - if ((resultType & OperationResultParcel.RESULT_ERROR) == 0) { + if ((resultType & OperationResult.RESULT_ERROR) == 0) { String withWarnings; duration = Duration.EXTRA_LONG; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java new file mode 100644 index 000000000..d2be1466f --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResult.java @@ -0,0 +1,594 @@ +/* + * Copyright (C) 2014 Dominik Schürmann + * Copyright (C) 2014 Vincent Breitmoser + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.service.results; + +import android.app.Activity; +import android.content.Intent; +import android.os.Parcel; +import android.os.Parcelable; +import android.view.View; + +import com.github.johnpersano.supertoasts.SuperCardToast; +import com.github.johnpersano.supertoasts.SuperToast; +import com.github.johnpersano.supertoasts.util.OnClickWrapper; +import com.github.johnpersano.supertoasts.util.Style; + +import org.sufficientlysecure.keychain.Constants; +import org.sufficientlysecure.keychain.R; +import org.sufficientlysecure.keychain.ui.LogDisplayActivity; +import org.sufficientlysecure.keychain.ui.LogDisplayFragment; +import org.sufficientlysecure.keychain.util.IterableIterator; +import org.sufficientlysecure.keychain.util.Log; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + +/** Represent the result of an operation. + * + * This class holds a result and the log of an operation. It can be subclassed + * to include typed additional information specific to the operation. To keep + * the class structure (somewhat) simple, this class contains an exhaustive + * list (ie, enum) of all possible log types, which should in all cases be tied + * to string resource ids. + * + * TODO ideally, this class should be abstract, and all actual results of a specific subclass + * + */ +public abstract class OperationResult implements Parcelable { + + public static final String EXTRA_RESULT = "operation_result"; + + /** Holds the overall result, the number specifying varying degrees of success: + * - The first bit is 0 on overall success, 1 on overall failure + * - The second bit indicates if the action was cancelled - may still be an error or success! + * - The third bit should be set if the operation succeeded with warnings + * All other bits may be used for more specific conditions. */ + final int mResult; + + public static final int RESULT_OK = 0; + public static final int RESULT_ERROR = 1; + public static final int RESULT_CANCELLED = 2; + public static final int RESULT_WARNINGS = 4; + + /// A list of log entries tied to the operation result. + final OperationLog mLog; + + public OperationResult(int result, OperationLog log) { + mResult = result; + mLog = log; + } + + public OperationResult(Parcel source) { + mResult = source.readInt(); + mLog = new OperationLog(); + mLog.addAll(source.createTypedArrayList(LogEntryParcel.CREATOR)); + } + + public int getResult() { + return mResult; + } + + public boolean success() { + return (mResult & RESULT_ERROR) == 0; + } + + public boolean cancelled() { + return (mResult & RESULT_CANCELLED) == RESULT_CANCELLED; + } + + public OperationLog getLog() { + return mLog; + } + + /** One entry in the log. */ + public static class LogEntryParcel implements Parcelable { + public final LogLevel mLevel; + public final LogType mType; + public final Object[] mParameters; + public final int mIndent; + + public LogEntryParcel(LogLevel level, LogType type, int indent, Object... parameters) { + mLevel = level; + mType = type; + mParameters = parameters; + mIndent = indent; + Log.v(Constants.TAG, "log: " + this.toString()); + } + + public LogEntryParcel(Parcel source) { + mLevel = LogLevel.values()[source.readInt()]; + mType = LogType.values()[source.readInt()]; + mParameters = (Object[]) source.readSerializable(); + mIndent = source.readInt(); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mLevel.ordinal()); + dest.writeInt(mType.ordinal()); + dest.writeSerializable(mParameters); + dest.writeInt(mIndent); + } + + public static final Creator CREATOR = new Creator() { + public LogEntryParcel createFromParcel(final Parcel source) { + return new LogEntryParcel(source); + } + + public LogEntryParcel[] newArray(final int size) { + return new LogEntryParcel[size]; + } + }; + + @Override + public String toString() { + return "LogEntryParcel{" + + "mLevel=" + mLevel + + ", mType=" + mType + + ", mParameters=" + Arrays.toString(mParameters) + + ", mIndent=" + mIndent + + '}'; + } + } + + public SuperCardToast createNotify(final Activity activity) { + + int color; + + // Take the last message as string + String str = activity.getString(mLog.getLast().mType.getMsgId()); + + // Not an overall failure + if (cancelled()) { + color = Style.RED; + } else if (success()) { + if (getLog().containsWarnings()) { + color = Style.ORANGE; + } else { + color = Style.GREEN; + } + } else { + color = Style.RED; + } + + boolean button = getLog() != null && !getLog().isEmpty(); + SuperCardToast toast = new SuperCardToast(activity, + button ? SuperToast.Type.BUTTON : SuperToast.Type.STANDARD, + Style.getStyle(color, SuperToast.Animations.POPUP)); + toast.setText(str); + toast.setDuration(SuperToast.Duration.EXTRA_LONG); + toast.setIndeterminate(false); + toast.setSwipeToDismiss(true); + // If we have a log and it's non-empty, show a View Log button + if (button) { + toast.setButtonIcon(R.drawable.ic_action_view_as_list, + activity.getResources().getString(R.string.view_log)); + toast.setButtonTextColor(activity.getResources().getColor(R.color.black)); + toast.setTextColor(activity.getResources().getColor(R.color.black)); + toast.setOnClickWrapper(new OnClickWrapper("supercardtoast", + new SuperToast.OnClickListener() { + @Override + public void onClick(View view, Parcelable token) { + Intent intent = new Intent( + activity, LogDisplayActivity.class); + intent.putExtra(LogDisplayFragment.EXTRA_RESULT, OperationResult.this); + activity.startActivity(intent); + } + } + )); + } + + return toast; + + } + + /** This is an enum of all possible log events. + * + * Element names should generally be prefixed with MSG_XX_ where XX is an + * identifier based on the related activity. + * + * Log messages should occur for each distinguishable action group. For + * each such group, one message is displayed followed by warnings or + * errors, and optionally subactions. The granularity should generally be + * optimistic: No "success" messages are printed except for the outermost + * operations - the success of an action group is indicated by the + * beginning message of the next action group. + * + * Log messages should be in present tense, There should be no trailing + * punctuation, except for error messages which may end in an exclamation + * mark. + * + */ + public static enum LogType { + + MSG_INTERNAL_ERROR (R.string.msg_internal_error), + MSG_OPERATION_CANCELLED (R.string.msg_cancelled), + + // import public + MSG_IP(R.string.msg_ip), + MSG_IP_APPLY_BATCH (R.string.msg_ip_apply_batch), + MSG_IP_BAD_TYPE_SECRET (R.string.msg_ip_bad_type_secret), + MSG_IP_DELETE_OLD_FAIL (R.string.msg_ip_delete_old_fail), + MSG_IP_DELETE_OLD_OK (R.string.msg_ip_delete_old_ok), + MSG_IP_ENCODE_FAIL (R.string.msg_ip_encode_fail), + MSG_IP_FAIL_IO_EXC (R.string.msg_ip_fail_io_exc), + MSG_IP_FAIL_OP_EXC (R.string.msg_ip_fail_op_exc), + MSG_IP_FAIL_REMOTE_EX (R.string.msg_ip_fail_remote_ex), + MSG_IP_INSERT_KEYRING (R.string.msg_ip_insert_keyring), + MSG_IP_INSERT_SUBKEYS (R.string.msg_ip_insert_keys), + MSG_IP_PREPARE (R.string.msg_ip_prepare), + MSG_IP_REINSERT_SECRET (R.string.msg_ip_reinsert_secret), + MSG_IP_MASTER (R.string.msg_ip_master), + MSG_IP_MASTER_EXPIRED (R.string.msg_ip_master_expired), + MSG_IP_MASTER_EXPIRES (R.string.msg_ip_master_expires), + MSG_IP_MASTER_FLAGS_CES (R.string.msg_ip_master_flags_ces), + MSG_IP_MASTER_FLAGS_CEX (R.string.msg_ip_master_flags_cex), + MSG_IP_MASTER_FLAGS_CXS (R.string.msg_ip_master_flags_cxs), + MSG_IP_MASTER_FLAGS_XES (R.string.msg_ip_master_flags_xes), + MSG_IP_MASTER_FLAGS_CXX (R.string.msg_ip_master_flags_cxx), + MSG_IP_MASTER_FLAGS_XEX (R.string.msg_ip_master_flags_xex), + MSG_IP_MASTER_FLAGS_XXS (R.string.msg_ip_master_flags_xxs), + MSG_IP_MASTER_FLAGS_XXX (R.string.msg_ip_master_flags_xxx), + MSG_IP_SUBKEY (R.string.msg_ip_subkey), + MSG_IP_SUBKEY_EXPIRED (R.string.msg_ip_subkey_expired), + MSG_IP_SUBKEY_EXPIRES (R.string.msg_ip_subkey_expires), + MSG_IP_SUBKEY_FLAGS_CES (R.string.msg_ip_subkey_flags_ces), + MSG_IP_SUBKEY_FLAGS_CEX (R.string.msg_ip_subkey_flags_cex), + MSG_IP_SUBKEY_FLAGS_CXS (R.string.msg_ip_subkey_flags_cxs), + MSG_IP_SUBKEY_FLAGS_XES (R.string.msg_ip_subkey_flags_xes), + MSG_IP_SUBKEY_FLAGS_CXX (R.string.msg_ip_subkey_flags_cxx), + MSG_IP_SUBKEY_FLAGS_XEX (R.string.msg_ip_subkey_flags_xex), + MSG_IP_SUBKEY_FLAGS_XXS (R.string.msg_ip_subkey_flags_xxs), + MSG_IP_SUBKEY_FLAGS_XXX (R.string.msg_ip_subkey_flags_xxx), + MSG_IP_SUCCESS (R.string.msg_ip_success), + MSG_IP_SUCCESS_IDENTICAL (R.string.msg_ip_success_identical), + MSG_IP_UID_CERT_BAD (R.string.msg_ip_uid_cert_bad), + MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error), + MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good), + MSG_IP_UID_CERTS_UNKNOWN (R.plurals.msg_ip_uid_certs_unknown), + MSG_IP_UID_CLASSIFYING_ZERO (R.string.msg_ip_uid_classifying_zero), + MSG_IP_UID_CLASSIFYING (R.plurals.msg_ip_uid_classifying), + MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder), + MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing), + MSG_IP_UID_REVOKED (R.string.msg_ip_uid_revoked), + + // import secret + MSG_IS(R.string.msg_is), + MSG_IS_BAD_TYPE_PUBLIC (R.string.msg_is_bad_type_public), + MSG_IS_DB_EXCEPTION (R.string.msg_is_db_exception), + MSG_IS_FAIL_IO_EXC (R.string.msg_is_io_exc), + MSG_IS_IMPORTING_SUBKEYS (R.string.msg_is_importing_subkeys), + MSG_IS_PUBRING_GENERATE (R.string.msg_is_pubring_generate), + MSG_IS_SUBKEY_NONEXISTENT (R.string.msg_is_subkey_nonexistent), + MSG_IS_SUBKEY_OK (R.string.msg_is_subkey_ok), + MSG_IS_SUBKEY_STRIPPED (R.string.msg_is_subkey_stripped), + MSG_IS_SUBKEY_DIVERT (R.string.msg_is_subkey_divert), + MSG_IS_SUBKEY_EMPTY (R.string.msg_is_subkey_empty), + MSG_IS_SUCCESS_IDENTICAL (R.string.msg_is_success_identical), + MSG_IS_SUCCESS (R.string.msg_is_success), + + // keyring canonicalization + MSG_KC_PUBLIC (R.string.msg_kc_public), + MSG_KC_SECRET (R.string.msg_kc_secret), + MSG_KC_ERROR_V3 (R.string.msg_kc_error_v3), + MSG_KC_ERROR_NO_UID (R.string.msg_kc_error_no_uid), + MSG_KC_ERROR_MASTER_ALGO (R.string.msg_kc_error_master_algo), + MSG_KC_MASTER (R.string.msg_kc_master), + MSG_KC_REVOKE_BAD_ERR (R.string.msg_kc_revoke_bad_err), + MSG_KC_REVOKE_BAD_LOCAL (R.string.msg_kc_revoke_bad_local), + MSG_KC_REVOKE_BAD_TIME (R.string.msg_kc_revoke_bad_time), + MSG_KC_REVOKE_BAD_TYPE (R.string.msg_kc_revoke_bad_type), + MSG_KC_REVOKE_BAD_TYPE_UID (R.string.msg_kc_revoke_bad_type_uid), + MSG_KC_REVOKE_BAD (R.string.msg_kc_revoke_bad), + MSG_KC_REVOKE_DUP (R.string.msg_kc_revoke_dup), + MSG_KC_SUB (R.string.msg_kc_sub), + MSG_KC_SUB_BAD(R.string.msg_kc_sub_bad), + MSG_KC_SUB_BAD_ERR(R.string.msg_kc_sub_bad_err), + MSG_KC_SUB_BAD_LOCAL(R.string.msg_kc_sub_bad_local), + MSG_KC_SUB_BAD_KEYID(R.string.msg_kc_sub_bad_keyid), + MSG_KC_SUB_BAD_TIME(R.string.msg_kc_sub_bad_time), + MSG_KC_SUB_BAD_TYPE(R.string.msg_kc_sub_bad_type), + MSG_KC_SUB_DUP (R.string.msg_kc_sub_dup), + MSG_KC_SUB_PRIMARY_BAD(R.string.msg_kc_sub_primary_bad), + MSG_KC_SUB_PRIMARY_BAD_ERR(R.string.msg_kc_sub_primary_bad_err), + MSG_KC_SUB_PRIMARY_NONE(R.string.msg_kc_sub_primary_none), + MSG_KC_SUB_NO_CERT(R.string.msg_kc_sub_no_cert), + MSG_KC_SUB_REVOKE_BAD_ERR (R.string.msg_kc_sub_revoke_bad_err), + MSG_KC_SUB_REVOKE_BAD (R.string.msg_kc_sub_revoke_bad), + MSG_KC_SUB_REVOKE_DUP (R.string.msg_kc_sub_revoke_dup), + MSG_KC_SUB_UNKNOWN_ALGO (R.string.msg_kc_sub_unknown_algo), + MSG_KC_SUCCESS_BAD (R.plurals.msg_kc_success_bad), + MSG_KC_SUCCESS_BAD_AND_RED (R.string.msg_kc_success_bad_and_red), + MSG_KC_SUCCESS_REDUNDANT (R.plurals.msg_kc_success_redundant), + MSG_KC_SUCCESS (R.string.msg_kc_success), + MSG_KC_UID_BAD_ERR (R.string.msg_kc_uid_bad_err), + MSG_KC_UID_BAD_LOCAL (R.string.msg_kc_uid_bad_local), + MSG_KC_UID_BAD_TIME (R.string.msg_kc_uid_bad_time), + MSG_KC_UID_BAD_TYPE (R.string.msg_kc_uid_bad_type), + MSG_KC_UID_BAD (R.string.msg_kc_uid_bad), + MSG_KC_UID_CERT_DUP (R.string.msg_kc_uid_cert_dup), + MSG_KC_UID_DUP (R.string.msg_kc_uid_dup), + MSG_KC_UID_FOREIGN (R.string.msg_kc_uid_foreign), + MSG_KC_UID_NO_CERT (R.string.msg_kc_uid_no_cert), + MSG_KC_UID_REVOKE_DUP (R.string.msg_kc_uid_revoke_dup), + MSG_KC_UID_REVOKE_OLD (R.string.msg_kc_uid_revoke_old), + MSG_KC_UID_REMOVE (R.string.msg_kc_uid_remove), + MSG_KC_UID_WARN_ENCODING (R.string.msg_kc_uid_warn_encoding), + + + // keyring consolidation + MSG_MG_ERROR_SECRET_DUMMY(R.string.msg_mg_error_secret_dummy), + MSG_MG_ERROR_ENCODE(R.string.msg_mg_error_encode), + MSG_MG_ERROR_HETEROGENEOUS(R.string.msg_mg_error_heterogeneous), + MSG_MG_PUBLIC (R.string.msg_mg_public), + MSG_MG_SECRET (R.string.msg_mg_secret), + MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey), + MSG_MG_FOUND_NEW (R.string.msg_mg_found_new), + MSG_MG_UNCHANGED (R.string.msg_mg_unchanged), + + // secret key create + MSG_CR (R.string.msg_cr), + MSG_CR_ERROR_NO_MASTER (R.string.msg_cr_error_no_master), + MSG_CR_ERROR_NO_USER_ID (R.string.msg_cr_error_no_user_id), + MSG_CR_ERROR_NO_CERTIFY (R.string.msg_cr_error_no_certify), + MSG_CR_ERROR_NULL_EXPIRY(R.string.msg_cr_error_null_expiry), + MSG_CR_ERROR_KEYSIZE_512 (R.string.msg_cr_error_keysize_512), + MSG_CR_ERROR_NO_KEYSIZE (R.string.msg_cr_error_no_keysize), + MSG_CR_ERROR_NO_CURVE (R.string.msg_cr_error_no_curve), + MSG_CR_ERROR_UNKNOWN_ALGO (R.string.msg_cr_error_unknown_algo), + MSG_CR_ERROR_INTERNAL_PGP (R.string.msg_cr_error_internal_pgp), + MSG_CR_ERROR_FLAGS_DSA (R.string.msg_cr_error_flags_dsa), + MSG_CR_ERROR_FLAGS_ELGAMAL (R.string.msg_cr_error_flags_elgamal), + MSG_CR_ERROR_FLAGS_ECDSA (R.string.msg_cr_error_flags_ecdsa), + MSG_CR_ERROR_FLAGS_ECDH (R.string.msg_cr_error_flags_ecdh), + + // secret key modify + MSG_MF (R.string.msg_mr), + MSG_MF_ERROR_ENCODE (R.string.msg_mf_error_encode), + MSG_MF_ERROR_FINGERPRINT (R.string.msg_mf_error_fingerprint), + MSG_MF_ERROR_KEYID (R.string.msg_mf_error_keyid), + MSG_MF_ERROR_INTEGRITY (R.string.msg_mf_error_integrity), + MSG_MF_ERROR_MASTER_NONE(R.string.msg_mf_error_master_none), + MSG_MF_ERROR_NO_CERTIFY (R.string.msg_cr_error_no_certify), + MSG_MF_ERROR_NOEXIST_PRIMARY (R.string.msg_mf_error_noexist_primary), + MSG_MF_ERROR_NOEXIST_REVOKE (R.string.msg_mf_error_noexist_revoke), + MSG_MF_ERROR_NULL_EXPIRY (R.string.msg_mf_error_null_expiry), + MSG_MF_ERROR_PASSPHRASE_MASTER(R.string.msg_mf_error_passphrase_master), + MSG_MF_ERROR_PAST_EXPIRY(R.string.msg_mf_error_past_expiry), + MSG_MF_ERROR_PGP (R.string.msg_mf_error_pgp), + MSG_MF_ERROR_REVOKED_PRIMARY (R.string.msg_mf_error_revoked_primary), + MSG_MF_ERROR_SIG (R.string.msg_mf_error_sig), + MSG_MF_ERROR_SUBKEY_MISSING(R.string.msg_mf_error_subkey_missing), + MSG_MF_MASTER (R.string.msg_mf_master), + MSG_MF_PASSPHRASE (R.string.msg_mf_passphrase), + MSG_MF_PASSPHRASE_KEY (R.string.msg_mf_passphrase_key), + MSG_MF_PASSPHRASE_EMPTY_RETRY (R.string.msg_mf_passphrase_empty_retry), + MSG_MF_PASSPHRASE_FAIL (R.string.msg_mf_passphrase_fail), + MSG_MF_PRIMARY_REPLACE_OLD (R.string.msg_mf_primary_replace_old), + MSG_MF_PRIMARY_NEW (R.string.msg_mf_primary_new), + MSG_MF_SUBKEY_CHANGE (R.string.msg_mf_subkey_change), + MSG_MF_SUBKEY_NEW_ID (R.string.msg_mf_subkey_new_id), + MSG_MF_SUBKEY_NEW (R.string.msg_mf_subkey_new), + MSG_MF_SUBKEY_REVOKE (R.string.msg_mf_subkey_revoke), + MSG_MF_SUBKEY_STRIP (R.string.msg_mf_subkey_strip), + MSG_MF_SUCCESS (R.string.msg_mf_success), + MSG_MF_UID_ADD (R.string.msg_mf_uid_add), + MSG_MF_UID_PRIMARY (R.string.msg_mf_uid_primary), + MSG_MF_UID_REVOKE (R.string.msg_mf_uid_revoke), + MSG_MF_UID_ERROR_EMPTY (R.string.msg_mf_uid_error_empty), + MSG_MF_UNLOCK_ERROR (R.string.msg_mf_unlock_error), + MSG_MF_UNLOCK (R.string.msg_mf_unlock), + + // consolidate + MSG_CON_CRITICAL_IN (R.string.msg_con_critical_in), + MSG_CON_CRITICAL_OUT (R.string.msg_con_critical_out), + MSG_CON_DB_CLEAR (R.string.msg_con_db_clear), + MSG_CON_DELETE_PUBLIC (R.string.msg_con_delete_public), + MSG_CON_DELETE_SECRET (R.string.msg_con_delete_secret), + MSG_CON_ERROR_BAD_STATE (R.string.msg_con_error_bad_state), + MSG_CON_ERROR_CONCURRENT(R.string.msg_con_error_concurrent), + MSG_CON_ERROR_DB (R.string.msg_con_error_db), + MSG_CON_ERROR_IO_PUBLIC (R.string.msg_con_error_io_public), + MSG_CON_ERROR_IO_SECRET (R.string.msg_con_error_io_secret), + MSG_CON_ERROR_PUBLIC (R.string.msg_con_error_public), + MSG_CON_ERROR_SECRET (R.string.msg_con_error_secret), + MSG_CON_RECOVER (R.plurals.msg_con_recover), + MSG_CON_RECOVER_UNKNOWN (R.string.msg_con_recover_unknown), + MSG_CON_REIMPORT_PUBLIC (R.plurals.msg_con_reimport_public), + MSG_CON_REIMPORT_PUBLIC_SKIP (R.string.msg_con_reimport_public_skip), + MSG_CON_REIMPORT_SECRET (R.plurals.msg_con_reimport_secret), + MSG_CON_REIMPORT_SECRET_SKIP (R.string.msg_con_reimport_secret_skip), + MSG_CON (R.string.msg_con), + MSG_CON_SAVE_PUBLIC (R.string.msg_con_save_public), + MSG_CON_SAVE_SECRET (R.string.msg_con_save_secret), + MSG_CON_SUCCESS (R.string.msg_con_success), + MSG_CON_WARN_DELETE_PUBLIC (R.string.msg_con_warn_delete_public), + MSG_CON_WARN_DELETE_SECRET (R.string.msg_con_warn_delete_secret), + + // messages used in UI code + MSG_EK_ERROR_DIVERT (R.string.msg_ek_error_divert), + MSG_EK_ERROR_DUMMY (R.string.msg_ek_error_dummy), + MSG_EK_ERROR_NOT_FOUND (R.string.msg_ek_error_not_found), + + // decryptverify + MSG_DC_ASKIP_NO_KEY (R.string.msg_dc_askip_no_key), + MSG_DC_ASKIP_NOT_ALLOWED (R.string.msg_dc_askip_not_allowed), + MSG_DC_ASYM (R.string.msg_dc_asym), + MSG_DC_CLEAR_DATA (R.string.msg_dc_clear_data), + MSG_DC_CLEAR_DECOMPRESS (R.string.msg_dc_clear_decompress), + MSG_DC_CLEAR_META_FILE (R.string.msg_dc_clear_meta_file), + MSG_DC_CLEAR_META_MIME (R.string.msg_dc_clear_meta_mime), + MSG_DC_CLEAR_META_SIZE (R.string.msg_dc_clear_meta_size), + MSG_DC_CLEAR_META_TIME (R.string.msg_dc_clear_meta_time), + MSG_DC_CLEAR (R.string.msg_dc_clear), + MSG_DC_CLEAR_SIGNATURE_BAD (R.string.msg_dc_clear_signature_bad), + MSG_DC_CLEAR_SIGNATURE_CHECK (R.string.msg_dc_clear_signature_check), + MSG_DC_CLEAR_SIGNATURE_OK (R.string.msg_dc_clear_signature_ok), + MSG_DC_CLEAR_SIGNATURE (R.string.msg_dc_clear_signature), + MSG_DC_ERROR_BAD_PASSPHRASE (R.string.msg_dc_error_bad_passphrase), + MSG_DC_ERROR_EXTRACT_KEY (R.string.msg_dc_error_extract_key), + MSG_DC_ERROR_INTEGRITY_CHECK (R.string.msg_dc_error_integrity_check), + MSG_DC_ERROR_INVALID_SIGLIST(R.string.msg_dc_error_invalid_siglist), + MSG_DC_ERROR_IO (R.string.msg_dc_error_io), + MSG_DC_ERROR_NO_DATA (R.string.msg_dc_error_no_data), + MSG_DC_ERROR_NO_KEY (R.string.msg_dc_error_no_key), + MSG_DC_ERROR_PGP_EXCEPTION (R.string.msg_dc_error_pgp_exception), + MSG_DC_INTEGRITY_CHECK_OK (R.string.msg_dc_integrity_check_ok), + MSG_DC_OK_META_ONLY (R.string.msg_dc_ok_meta_only), + MSG_DC_OK (R.string.msg_dc_ok), + MSG_DC_PASS_CACHED (R.string.msg_dc_pass_cached), + MSG_DC_PENDING_NFC (R.string.msg_dc_pending_nfc), + MSG_DC_PENDING_PASSPHRASE (R.string.msg_dc_pending_passphrase), + MSG_DC_PREP_STREAMS (R.string.msg_dc_prep_streams), + MSG_DC (R.string.msg_dc), + MSG_DC_SYM (R.string.msg_dc_sym), + MSG_DC_SYM_SKIP (R.string.msg_dc_sym_skip), + MSG_DC_TRAIL_ASYM (R.string.msg_dc_trail_asym), + MSG_DC_TRAIL_SYM (R.string.msg_dc_trail_sym), + MSG_DC_TRAIL_UNKNOWN (R.string.msg_dc_trail_unknown), + MSG_DC_UNLOCKING (R.string.msg_dc_unlocking), + + // signencrypt + MSG_SE_ASYMMETRIC (R.string.msg_se_asymmetric), + MSG_SE_CLEARSIGN_ONLY (R.string.msg_se_clearsign_only), + MSG_SE_COMPRESSING (R.string.msg_se_compressing), + MSG_SE_ENCRYPTING (R.string.msg_se_encrypting), + MSG_SE_ERROR_BAD_PASSPHRASE (R.string.msg_se_error_bad_passphrase), + MSG_SE_ERROR_IO (R.string.msg_se_error_io), + MSG_SE_ERROR_SIGN_KEY(R.string.msg_se_error_sign_key), + MSG_SE_ERROR_KEY_SIGN (R.string.msg_se_error_key_sign), + MSG_SE_ERROR_NFC (R.string.msg_se_error_nfc), + MSG_SE_ERROR_NO_PASSPHRASE (R.string.msg_se_error_no_passphrase), + MSG_SE_ERROR_PGP (R.string.msg_se_error_pgp), + MSG_SE_ERROR_SIG (R.string.msg_se_error_sig), + MSG_SE_ERROR_UNLOCK (R.string.msg_se_error_unlock), + MSG_SE_KEY_OK (R.string.msg_se_key_ok), + MSG_SE_KEY_UNKNOWN (R.string.msg_se_key_unknown), + MSG_SE_KEY_WARN (R.string.msg_se_key_warn), + MSG_SE_OK (R.string.msg_se_ok), + MSG_SE_PENDING_NFC (R.string.msg_se_pending_nfc), + MSG_SE (R.string.msg_se), + MSG_SE_SIGNING (R.string.msg_se_signing), + MSG_SE_SIGCRYPTING (R.string.msg_se_sigcrypting), + MSG_SE_SYMMETRIC (R.string.msg_se_symmetric), + + MSG_CRT_UPLOAD_SUCCESS (R.string.msg_crt_upload_success), + MSG_CRT_SUCCESS (R.string.msg_crt_success), + + MSG_ACC_SAVED (R.string.api_settings_save) + + ; + + private final int mMsgId; + LogType(int msgId) { + mMsgId = msgId; + } + public int getMsgId() { + return mMsgId; + } + } + + /** Enumeration of possible log levels. */ + public static enum LogLevel { + DEBUG, + INFO, + WARN, + ERROR, // should occur once at the end of a failed operation + START, // should occur once at the start of each independent operation + OK, // should occur once at the end of a successful operation + CANCELLED, // should occur once at the end of a cancelled operation + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mResult); + if (mLog != null) { + dest.writeTypedList(mLog.toList()); + } + } + + public static class OperationLog implements Iterable { + + private final List mParcels = new ArrayList(); + + /// Simple convenience method + public void add(LogLevel level, LogType type, int indent, Object... parameters) { + mParcels.add(new OperationResult.LogEntryParcel(level, type, indent, parameters)); + } + + public void add(LogLevel level, LogType type, int indent) { + mParcels.add(new OperationResult.LogEntryParcel(level, type, indent, (Object[]) null)); + } + + public boolean containsType(LogType type) { + for(LogEntryParcel entry : new IterableIterator(mParcels.iterator())) { + if (entry.mType == type) { + return true; + } + } + return false; + } + + public boolean containsWarnings() { + for(LogEntryParcel entry : new IterableIterator(mParcels.iterator())) { + if (entry.mLevel == LogLevel.WARN || entry.mLevel == LogLevel.ERROR) { + return true; + } + } + return false; + } + + public void addAll(List parcels) { + mParcels.addAll(parcels); + } + + public List toList() { + return mParcels; + } + + public boolean isEmpty() { + return mParcels.isEmpty(); + } + + public LogEntryParcel getLast() { + if (mParcels.isEmpty()) { + return null; + } + return mParcels.get(mParcels.size() -1); + } + + @Override + public Iterator iterator() { + return mParcels.iterator(); + } + } + +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java deleted file mode 100644 index 56f5248cb..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java +++ /dev/null @@ -1,602 +0,0 @@ -/* - * Copyright (C) 2014 Dominik Schürmann - * Copyright (C) 2014 Vincent Breitmoser - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.sufficientlysecure.keychain.service.results; - -import android.app.Activity; -import android.content.Intent; -import android.os.Parcel; -import android.os.Parcelable; -import android.view.View; - -import com.github.johnpersano.supertoasts.SuperCardToast; -import com.github.johnpersano.supertoasts.SuperToast; -import com.github.johnpersano.supertoasts.util.OnClickWrapper; -import com.github.johnpersano.supertoasts.util.Style; - -import org.sufficientlysecure.keychain.Constants; -import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.ui.LogDisplayActivity; -import org.sufficientlysecure.keychain.ui.LogDisplayFragment; -import org.sufficientlysecure.keychain.util.IterableIterator; -import org.sufficientlysecure.keychain.util.Log; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -/** Represent the result of an operation. - * - * This class holds a result and the log of an operation. It can be subclassed - * to include typed additional information specific to the operation. To keep - * the class structure (somewhat) simple, this class contains an exhaustive - * list (ie, enum) of all possible log types, which should in all cases be tied - * to string resource ids. - * - * TODO ideally, this class should be abstract, and all actual results of a specific subclass - * - */ -public class OperationResultParcel implements Parcelable { - - public static final String EXTRA_RESULT = "operation_result"; - - /** Holds the overall result, the number specifying varying degrees of success: - * - The first bit is 0 on overall success, 1 on overall failure - * - The second bit indicates if the action was cancelled - may still be an error or success! - * - The third bit should be set if the operation succeeded with warnings - * All other bits may be used for more specific conditions. */ - final int mResult; - - public static final int RESULT_OK = 0; - public static final int RESULT_ERROR = 1; - public static final int RESULT_CANCELLED = 2; - public static final int RESULT_WARNINGS = 4; - - /// A list of log entries tied to the operation result. - final OperationLog mLog; - - public OperationResultParcel(int result, OperationLog log) { - mResult = result; - mLog = log; - } - - public OperationResultParcel(Parcel source) { - mResult = source.readInt(); - mLog = new OperationLog(); - mLog.addAll(source.createTypedArrayList(LogEntryParcel.CREATOR)); - } - - public int getResult() { - return mResult; - } - - public boolean success() { - return (mResult & RESULT_ERROR) == 0; - } - - public boolean cancelled() { - return (mResult & RESULT_CANCELLED) == RESULT_CANCELLED; - } - - public OperationLog getLog() { - return mLog; - } - - /** One entry in the log. */ - public static class LogEntryParcel implements Parcelable { - public final LogLevel mLevel; - public final LogType mType; - public final Object[] mParameters; - public final int mIndent; - - public LogEntryParcel(LogLevel level, LogType type, int indent, Object... parameters) { - mLevel = level; - mType = type; - mParameters = parameters; - mIndent = indent; - Log.v(Constants.TAG, "log: " + this.toString()); - } - - public LogEntryParcel(Parcel source) { - mLevel = LogLevel.values()[source.readInt()]; - mType = LogType.values()[source.readInt()]; - mParameters = (Object[]) source.readSerializable(); - mIndent = source.readInt(); - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(mLevel.ordinal()); - dest.writeInt(mType.ordinal()); - dest.writeSerializable(mParameters); - dest.writeInt(mIndent); - } - - public static final Creator CREATOR = new Creator() { - public LogEntryParcel createFromParcel(final Parcel source) { - return new LogEntryParcel(source); - } - - public LogEntryParcel[] newArray(final int size) { - return new LogEntryParcel[size]; - } - }; - - @Override - public String toString() { - return "LogEntryParcel{" + - "mLevel=" + mLevel + - ", mType=" + mType + - ", mParameters=" + Arrays.toString(mParameters) + - ", mIndent=" + mIndent + - '}'; - } - } - - public SuperCardToast createNotify(final Activity activity) { - - String str; - int color; - - // Not an overall failure - if (cancelled()) { - color = Style.RED; - str = "operation cancelled!"; - } else if (success()) { - if (getLog().containsWarnings()) { - color = Style.ORANGE; - } else { - color = Style.GREEN; - } - str = "operation succeeded!"; - // str = activity.getString(R.string.import_error); - } else { - color = Style.RED; - str = "operation failed"; - // str = activity.getString(R.string.import_error); - } - - boolean button = getLog() != null && !getLog().isEmpty(); - SuperCardToast toast = new SuperCardToast(activity, - button ? SuperToast.Type.BUTTON : SuperToast.Type.STANDARD, - Style.getStyle(color, SuperToast.Animations.POPUP)); - toast.setText(str); - toast.setDuration(SuperToast.Duration.EXTRA_LONG); - toast.setIndeterminate(false); - toast.setSwipeToDismiss(true); - // If we have a log and it's non-empty, show a View Log button - if (button) { - toast.setButtonIcon(R.drawable.ic_action_view_as_list, - activity.getResources().getString(R.string.view_log)); - toast.setButtonTextColor(activity.getResources().getColor(R.color.black)); - toast.setTextColor(activity.getResources().getColor(R.color.black)); - toast.setOnClickWrapper(new OnClickWrapper("supercardtoast", - new SuperToast.OnClickListener() { - @Override - public void onClick(View view, Parcelable token) { - Intent intent = new Intent( - activity, LogDisplayActivity.class); - intent.putExtra(LogDisplayFragment.EXTRA_RESULT, OperationResultParcel.this); - activity.startActivity(intent); - } - } - )); - } - - return toast; - - } - - /** This is an enum of all possible log events. - * - * Element names should generally be prefixed with MSG_XX_ where XX is an - * identifier based on the related activity. - * - * Log messages should occur for each distinguishable action group. For - * each such group, one message is displayed followed by warnings or - * errors, and optionally subactions. The granularity should generally be - * optimistic: No "success" messages are printed except for the outermost - * operations - the success of an action group is indicated by the - * beginning message of the next action group. - * - * Log messages should be in present tense, There should be no trailing - * punctuation, except for error messages which may end in an exclamation - * mark. - * - */ - public static enum LogType { - - MSG_INTERNAL_ERROR (R.string.msg_internal_error), - MSG_OPERATION_CANCELLED (R.string.msg_cancelled), - - // import public - MSG_IP(R.string.msg_ip), - MSG_IP_APPLY_BATCH (R.string.msg_ip_apply_batch), - MSG_IP_BAD_TYPE_SECRET (R.string.msg_ip_bad_type_secret), - MSG_IP_DELETE_OLD_FAIL (R.string.msg_ip_delete_old_fail), - MSG_IP_DELETE_OLD_OK (R.string.msg_ip_delete_old_ok), - MSG_IP_ENCODE_FAIL (R.string.msg_ip_encode_fail), - MSG_IP_FAIL_IO_EXC (R.string.msg_ip_fail_io_exc), - MSG_IP_FAIL_OP_EXC (R.string.msg_ip_fail_op_exc), - MSG_IP_FAIL_REMOTE_EX (R.string.msg_ip_fail_remote_ex), - MSG_IP_INSERT_KEYRING (R.string.msg_ip_insert_keyring), - MSG_IP_INSERT_SUBKEYS (R.string.msg_ip_insert_keys), - MSG_IP_PREPARE (R.string.msg_ip_prepare), - MSG_IP_REINSERT_SECRET (R.string.msg_ip_reinsert_secret), - MSG_IP_MASTER (R.string.msg_ip_master), - MSG_IP_MASTER_EXPIRED (R.string.msg_ip_master_expired), - MSG_IP_MASTER_EXPIRES (R.string.msg_ip_master_expires), - MSG_IP_MASTER_FLAGS_CES (R.string.msg_ip_master_flags_ces), - MSG_IP_MASTER_FLAGS_CEX (R.string.msg_ip_master_flags_cex), - MSG_IP_MASTER_FLAGS_CXS (R.string.msg_ip_master_flags_cxs), - MSG_IP_MASTER_FLAGS_XES (R.string.msg_ip_master_flags_xes), - MSG_IP_MASTER_FLAGS_CXX (R.string.msg_ip_master_flags_cxx), - MSG_IP_MASTER_FLAGS_XEX (R.string.msg_ip_master_flags_xex), - MSG_IP_MASTER_FLAGS_XXS (R.string.msg_ip_master_flags_xxs), - MSG_IP_MASTER_FLAGS_XXX (R.string.msg_ip_master_flags_xxx), - MSG_IP_SUBKEY (R.string.msg_ip_subkey), - MSG_IP_SUBKEY_EXPIRED (R.string.msg_ip_subkey_expired), - MSG_IP_SUBKEY_EXPIRES (R.string.msg_ip_subkey_expires), - MSG_IP_SUBKEY_FLAGS_CES (R.string.msg_ip_subkey_flags_ces), - MSG_IP_SUBKEY_FLAGS_CEX (R.string.msg_ip_subkey_flags_cex), - MSG_IP_SUBKEY_FLAGS_CXS (R.string.msg_ip_subkey_flags_cxs), - MSG_IP_SUBKEY_FLAGS_XES (R.string.msg_ip_subkey_flags_xes), - MSG_IP_SUBKEY_FLAGS_CXX (R.string.msg_ip_subkey_flags_cxx), - MSG_IP_SUBKEY_FLAGS_XEX (R.string.msg_ip_subkey_flags_xex), - MSG_IP_SUBKEY_FLAGS_XXS (R.string.msg_ip_subkey_flags_xxs), - MSG_IP_SUBKEY_FLAGS_XXX (R.string.msg_ip_subkey_flags_xxx), - MSG_IP_SUCCESS (R.string.msg_ip_success), - MSG_IP_SUCCESS_IDENTICAL (R.string.msg_ip_success_identical), - MSG_IP_UID_CERT_BAD (R.string.msg_ip_uid_cert_bad), - MSG_IP_UID_CERT_ERROR (R.string.msg_ip_uid_cert_error), - MSG_IP_UID_CERT_GOOD (R.string.msg_ip_uid_cert_good), - MSG_IP_UID_CERTS_UNKNOWN (R.plurals.msg_ip_uid_certs_unknown), - MSG_IP_UID_CLASSIFYING_ZERO (R.string.msg_ip_uid_classifying_zero), - MSG_IP_UID_CLASSIFYING (R.plurals.msg_ip_uid_classifying), - MSG_IP_UID_REORDER(R.string.msg_ip_uid_reorder), - MSG_IP_UID_PROCESSING (R.string.msg_ip_uid_processing), - MSG_IP_UID_REVOKED (R.string.msg_ip_uid_revoked), - - // import secret - MSG_IS(R.string.msg_is), - MSG_IS_BAD_TYPE_PUBLIC (R.string.msg_is_bad_type_public), - MSG_IS_DB_EXCEPTION (R.string.msg_is_db_exception), - MSG_IS_FAIL_IO_EXC (R.string.msg_is_io_exc), - MSG_IS_IMPORTING_SUBKEYS (R.string.msg_is_importing_subkeys), - MSG_IS_PUBRING_GENERATE (R.string.msg_is_pubring_generate), - MSG_IS_SUBKEY_NONEXISTENT (R.string.msg_is_subkey_nonexistent), - MSG_IS_SUBKEY_OK (R.string.msg_is_subkey_ok), - MSG_IS_SUBKEY_STRIPPED (R.string.msg_is_subkey_stripped), - MSG_IS_SUBKEY_DIVERT (R.string.msg_is_subkey_divert), - MSG_IS_SUBKEY_EMPTY (R.string.msg_is_subkey_empty), - MSG_IS_SUCCESS_IDENTICAL (R.string.msg_is_success_identical), - MSG_IS_SUCCESS (R.string.msg_is_success), - - // keyring canonicalization - MSG_KC_PUBLIC (R.string.msg_kc_public), - MSG_KC_SECRET (R.string.msg_kc_secret), - MSG_KC_ERROR_V3 (R.string.msg_kc_error_v3), - MSG_KC_ERROR_NO_UID (R.string.msg_kc_error_no_uid), - MSG_KC_ERROR_MASTER_ALGO (R.string.msg_kc_error_master_algo), - MSG_KC_MASTER (R.string.msg_kc_master), - MSG_KC_REVOKE_BAD_ERR (R.string.msg_kc_revoke_bad_err), - MSG_KC_REVOKE_BAD_LOCAL (R.string.msg_kc_revoke_bad_local), - MSG_KC_REVOKE_BAD_TIME (R.string.msg_kc_revoke_bad_time), - MSG_KC_REVOKE_BAD_TYPE (R.string.msg_kc_revoke_bad_type), - MSG_KC_REVOKE_BAD_TYPE_UID (R.string.msg_kc_revoke_bad_type_uid), - MSG_KC_REVOKE_BAD (R.string.msg_kc_revoke_bad), - MSG_KC_REVOKE_DUP (R.string.msg_kc_revoke_dup), - MSG_KC_SUB (R.string.msg_kc_sub), - MSG_KC_SUB_BAD(R.string.msg_kc_sub_bad), - MSG_KC_SUB_BAD_ERR(R.string.msg_kc_sub_bad_err), - MSG_KC_SUB_BAD_LOCAL(R.string.msg_kc_sub_bad_local), - MSG_KC_SUB_BAD_KEYID(R.string.msg_kc_sub_bad_keyid), - MSG_KC_SUB_BAD_TIME(R.string.msg_kc_sub_bad_time), - MSG_KC_SUB_BAD_TYPE(R.string.msg_kc_sub_bad_type), - MSG_KC_SUB_DUP (R.string.msg_kc_sub_dup), - MSG_KC_SUB_PRIMARY_BAD(R.string.msg_kc_sub_primary_bad), - MSG_KC_SUB_PRIMARY_BAD_ERR(R.string.msg_kc_sub_primary_bad_err), - MSG_KC_SUB_PRIMARY_NONE(R.string.msg_kc_sub_primary_none), - MSG_KC_SUB_NO_CERT(R.string.msg_kc_sub_no_cert), - MSG_KC_SUB_REVOKE_BAD_ERR (R.string.msg_kc_sub_revoke_bad_err), - MSG_KC_SUB_REVOKE_BAD (R.string.msg_kc_sub_revoke_bad), - MSG_KC_SUB_REVOKE_DUP (R.string.msg_kc_sub_revoke_dup), - MSG_KC_SUB_UNKNOWN_ALGO (R.string.msg_kc_sub_unknown_algo), - MSG_KC_SUCCESS_BAD (R.plurals.msg_kc_success_bad), - MSG_KC_SUCCESS_BAD_AND_RED (R.string.msg_kc_success_bad_and_red), - MSG_KC_SUCCESS_REDUNDANT (R.plurals.msg_kc_success_redundant), - MSG_KC_SUCCESS (R.string.msg_kc_success), - MSG_KC_UID_BAD_ERR (R.string.msg_kc_uid_bad_err), - MSG_KC_UID_BAD_LOCAL (R.string.msg_kc_uid_bad_local), - MSG_KC_UID_BAD_TIME (R.string.msg_kc_uid_bad_time), - MSG_KC_UID_BAD_TYPE (R.string.msg_kc_uid_bad_type), - MSG_KC_UID_BAD (R.string.msg_kc_uid_bad), - MSG_KC_UID_CERT_DUP (R.string.msg_kc_uid_cert_dup), - MSG_KC_UID_DUP (R.string.msg_kc_uid_dup), - MSG_KC_UID_FOREIGN (R.string.msg_kc_uid_foreign), - MSG_KC_UID_NO_CERT (R.string.msg_kc_uid_no_cert), - MSG_KC_UID_REVOKE_DUP (R.string.msg_kc_uid_revoke_dup), - MSG_KC_UID_REVOKE_OLD (R.string.msg_kc_uid_revoke_old), - MSG_KC_UID_REMOVE (R.string.msg_kc_uid_remove), - MSG_KC_UID_WARN_ENCODING (R.string.msg_kc_uid_warn_encoding), - - - // keyring consolidation - MSG_MG_ERROR_SECRET_DUMMY(R.string.msg_mg_error_secret_dummy), - MSG_MG_ERROR_ENCODE(R.string.msg_mg_error_encode), - MSG_MG_ERROR_HETEROGENEOUS(R.string.msg_mg_error_heterogeneous), - MSG_MG_PUBLIC (R.string.msg_mg_public), - MSG_MG_SECRET (R.string.msg_mg_secret), - MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey), - MSG_MG_FOUND_NEW (R.string.msg_mg_found_new), - MSG_MG_UNCHANGED (R.string.msg_mg_unchanged), - - // secret key create - MSG_CR (R.string.msg_cr), - MSG_CR_ERROR_NO_MASTER (R.string.msg_cr_error_no_master), - MSG_CR_ERROR_NO_USER_ID (R.string.msg_cr_error_no_user_id), - MSG_CR_ERROR_NO_CERTIFY (R.string.msg_cr_error_no_certify), - MSG_CR_ERROR_NULL_EXPIRY(R.string.msg_cr_error_null_expiry), - MSG_CR_ERROR_KEYSIZE_512 (R.string.msg_cr_error_keysize_512), - MSG_CR_ERROR_NO_KEYSIZE (R.string.msg_cr_error_no_keysize), - MSG_CR_ERROR_NO_CURVE (R.string.msg_cr_error_no_curve), - MSG_CR_ERROR_UNKNOWN_ALGO (R.string.msg_cr_error_unknown_algo), - MSG_CR_ERROR_INTERNAL_PGP (R.string.msg_cr_error_internal_pgp), - MSG_CR_ERROR_FLAGS_DSA (R.string.msg_cr_error_flags_dsa), - MSG_CR_ERROR_FLAGS_ELGAMAL (R.string.msg_cr_error_flags_elgamal), - MSG_CR_ERROR_FLAGS_ECDSA (R.string.msg_cr_error_flags_ecdsa), - MSG_CR_ERROR_FLAGS_ECDH (R.string.msg_cr_error_flags_ecdh), - - // secret key modify - MSG_MF (R.string.msg_mr), - MSG_MF_ERROR_ENCODE (R.string.msg_mf_error_encode), - MSG_MF_ERROR_FINGERPRINT (R.string.msg_mf_error_fingerprint), - MSG_MF_ERROR_KEYID (R.string.msg_mf_error_keyid), - MSG_MF_ERROR_INTEGRITY (R.string.msg_mf_error_integrity), - MSG_MF_ERROR_MASTER_NONE(R.string.msg_mf_error_master_none), - MSG_MF_ERROR_NO_CERTIFY (R.string.msg_cr_error_no_certify), - MSG_MF_ERROR_NOEXIST_PRIMARY (R.string.msg_mf_error_noexist_primary), - MSG_MF_ERROR_NOEXIST_REVOKE (R.string.msg_mf_error_noexist_revoke), - MSG_MF_ERROR_NULL_EXPIRY (R.string.msg_mf_error_null_expiry), - MSG_MF_ERROR_PASSPHRASE_MASTER(R.string.msg_mf_error_passphrase_master), - MSG_MF_ERROR_PAST_EXPIRY(R.string.msg_mf_error_past_expiry), - MSG_MF_ERROR_PGP (R.string.msg_mf_error_pgp), - MSG_MF_ERROR_REVOKED_PRIMARY (R.string.msg_mf_error_revoked_primary), - MSG_MF_ERROR_SIG (R.string.msg_mf_error_sig), - MSG_MF_ERROR_SUBKEY_MISSING(R.string.msg_mf_error_subkey_missing), - MSG_MF_MASTER (R.string.msg_mf_master), - MSG_MF_PASSPHRASE (R.string.msg_mf_passphrase), - MSG_MF_PASSPHRASE_KEY (R.string.msg_mf_passphrase_key), - MSG_MF_PASSPHRASE_EMPTY_RETRY (R.string.msg_mf_passphrase_empty_retry), - MSG_MF_PASSPHRASE_FAIL (R.string.msg_mf_passphrase_fail), - MSG_MF_PRIMARY_REPLACE_OLD (R.string.msg_mf_primary_replace_old), - MSG_MF_PRIMARY_NEW (R.string.msg_mf_primary_new), - MSG_MF_SUBKEY_CHANGE (R.string.msg_mf_subkey_change), - MSG_MF_SUBKEY_NEW_ID (R.string.msg_mf_subkey_new_id), - MSG_MF_SUBKEY_NEW (R.string.msg_mf_subkey_new), - MSG_MF_SUBKEY_REVOKE (R.string.msg_mf_subkey_revoke), - MSG_MF_SUBKEY_STRIP (R.string.msg_mf_subkey_strip), - MSG_MF_SUCCESS (R.string.msg_mf_success), - MSG_MF_UID_ADD (R.string.msg_mf_uid_add), - MSG_MF_UID_PRIMARY (R.string.msg_mf_uid_primary), - MSG_MF_UID_REVOKE (R.string.msg_mf_uid_revoke), - MSG_MF_UID_ERROR_EMPTY (R.string.msg_mf_uid_error_empty), - MSG_MF_UNLOCK_ERROR (R.string.msg_mf_unlock_error), - MSG_MF_UNLOCK (R.string.msg_mf_unlock), - - // consolidate - MSG_CON_CRITICAL_IN (R.string.msg_con_critical_in), - MSG_CON_CRITICAL_OUT (R.string.msg_con_critical_out), - MSG_CON_DB_CLEAR (R.string.msg_con_db_clear), - MSG_CON_DELETE_PUBLIC (R.string.msg_con_delete_public), - MSG_CON_DELETE_SECRET (R.string.msg_con_delete_secret), - MSG_CON_ERROR_BAD_STATE (R.string.msg_con_error_bad_state), - MSG_CON_ERROR_CONCURRENT(R.string.msg_con_error_concurrent), - MSG_CON_ERROR_DB (R.string.msg_con_error_db), - MSG_CON_ERROR_IO_PUBLIC (R.string.msg_con_error_io_public), - MSG_CON_ERROR_IO_SECRET (R.string.msg_con_error_io_secret), - MSG_CON_ERROR_PUBLIC (R.string.msg_con_error_public), - MSG_CON_ERROR_SECRET (R.string.msg_con_error_secret), - MSG_CON_RECOVER (R.plurals.msg_con_recover), - MSG_CON_RECOVER_UNKNOWN (R.string.msg_con_recover_unknown), - MSG_CON_REIMPORT_PUBLIC (R.plurals.msg_con_reimport_public), - MSG_CON_REIMPORT_PUBLIC_SKIP (R.string.msg_con_reimport_public_skip), - MSG_CON_REIMPORT_SECRET (R.plurals.msg_con_reimport_secret), - MSG_CON_REIMPORT_SECRET_SKIP (R.string.msg_con_reimport_secret_skip), - MSG_CON (R.string.msg_con), - MSG_CON_SAVE_PUBLIC (R.string.msg_con_save_public), - MSG_CON_SAVE_SECRET (R.string.msg_con_save_secret), - MSG_CON_SUCCESS (R.string.msg_con_success), - MSG_CON_WARN_DELETE_PUBLIC (R.string.msg_con_warn_delete_public), - MSG_CON_WARN_DELETE_SECRET (R.string.msg_con_warn_delete_secret), - - // messages used in UI code - MSG_EK_ERROR_DIVERT (R.string.msg_ek_error_divert), - MSG_EK_ERROR_DUMMY (R.string.msg_ek_error_dummy), - MSG_EK_ERROR_NOT_FOUND (R.string.msg_ek_error_not_found), - - // decryptverify - MSG_DC_ASKIP_NO_KEY (R.string.msg_dc_askip_no_key), - MSG_DC_ASKIP_NOT_ALLOWED (R.string.msg_dc_askip_not_allowed), - MSG_DC_ASYM (R.string.msg_dc_asym), - MSG_DC_CLEAR_DATA (R.string.msg_dc_clear_data), - MSG_DC_CLEAR_DECOMPRESS (R.string.msg_dc_clear_decompress), - MSG_DC_CLEAR_META_FILE (R.string.msg_dc_clear_meta_file), - MSG_DC_CLEAR_META_MIME (R.string.msg_dc_clear_meta_mime), - MSG_DC_CLEAR_META_SIZE (R.string.msg_dc_clear_meta_size), - MSG_DC_CLEAR_META_TIME (R.string.msg_dc_clear_meta_time), - MSG_DC_CLEAR (R.string.msg_dc_clear), - MSG_DC_CLEAR_SIGNATURE_BAD (R.string.msg_dc_clear_signature_bad), - MSG_DC_CLEAR_SIGNATURE_CHECK (R.string.msg_dc_clear_signature_check), - MSG_DC_CLEAR_SIGNATURE_OK (R.string.msg_dc_clear_signature_ok), - MSG_DC_CLEAR_SIGNATURE (R.string.msg_dc_clear_signature), - MSG_DC_ERROR_BAD_PASSPHRASE (R.string.msg_dc_error_bad_passphrase), - MSG_DC_ERROR_EXTRACT_KEY (R.string.msg_dc_error_extract_key), - MSG_DC_ERROR_INTEGRITY_CHECK (R.string.msg_dc_error_integrity_check), - MSG_DC_ERROR_INVALID_SIGLIST(R.string.msg_dc_error_invalid_siglist), - MSG_DC_ERROR_IO (R.string.msg_dc_error_io), - MSG_DC_ERROR_NO_DATA (R.string.msg_dc_error_no_data), - MSG_DC_ERROR_NO_KEY (R.string.msg_dc_error_no_key), - MSG_DC_ERROR_PGP_EXCEPTION (R.string.msg_dc_error_pgp_exception), - MSG_DC_INTEGRITY_CHECK_OK (R.string.msg_dc_integrity_check_ok), - MSG_DC_OK_META_ONLY (R.string.msg_dc_ok_meta_only), - MSG_DC_OK (R.string.msg_dc_ok), - MSG_DC_PASS_CACHED (R.string.msg_dc_pass_cached), - MSG_DC_PENDING_NFC (R.string.msg_dc_pending_nfc), - MSG_DC_PENDING_PASSPHRASE (R.string.msg_dc_pending_passphrase), - MSG_DC_PREP_STREAMS (R.string.msg_dc_prep_streams), - MSG_DC (R.string.msg_dc), - MSG_DC_SYM (R.string.msg_dc_sym), - MSG_DC_SYM_SKIP (R.string.msg_dc_sym_skip), - MSG_DC_TRAIL_ASYM (R.string.msg_dc_trail_asym), - MSG_DC_TRAIL_SYM (R.string.msg_dc_trail_sym), - MSG_DC_TRAIL_UNKNOWN (R.string.msg_dc_trail_unknown), - MSG_DC_UNLOCKING (R.string.msg_dc_unlocking), - - // signencrypt - MSG_SE_ASYMMETRIC (R.string.msg_se_asymmetric), - MSG_SE_CLEARSIGN_ONLY (R.string.msg_se_clearsign_only), - MSG_SE_COMPRESSING (R.string.msg_se_compressing), - MSG_SE_ENCRYPTING (R.string.msg_se_encrypting), - MSG_SE_ERROR_BAD_PASSPHRASE (R.string.msg_se_error_bad_passphrase), - MSG_SE_ERROR_IO (R.string.msg_se_error_io), - MSG_SE_ERROR_SIGN_KEY(R.string.msg_se_error_sign_key), - MSG_SE_ERROR_KEY_SIGN (R.string.msg_se_error_key_sign), - MSG_SE_ERROR_NFC (R.string.msg_se_error_nfc), - MSG_SE_ERROR_NO_PASSPHRASE (R.string.msg_se_error_no_passphrase), - MSG_SE_ERROR_PGP (R.string.msg_se_error_pgp), - MSG_SE_ERROR_SIG (R.string.msg_se_error_sig), - MSG_SE_ERROR_UNLOCK (R.string.msg_se_error_unlock), - MSG_SE_KEY_OK (R.string.msg_se_key_ok), - MSG_SE_KEY_UNKNOWN (R.string.msg_se_key_unknown), - MSG_SE_KEY_WARN (R.string.msg_se_key_warn), - MSG_SE_OK (R.string.msg_se_ok), - MSG_SE_PENDING_NFC (R.string.msg_se_pending_nfc), - MSG_SE (R.string.msg_se), - MSG_SE_SIGNING (R.string.msg_se_signing), - MSG_SE_SIGCRYPTING (R.string.msg_se_sigcrypting), - MSG_SE_SYMMETRIC (R.string.msg_se_symmetric), - - ; - - private final int mMsgId; - LogType(int msgId) { - mMsgId = msgId; - } - public int getMsgId() { - return mMsgId; - } - } - - /** Enumeration of possible log levels. */ - public static enum LogLevel { - DEBUG, - INFO, - WARN, - ERROR, // should occur once at the end of a failed operation - START, // should occur once at the start of each independent operation - OK, // should occur once at the end of a successful operation - CANCELLED, // should occur once at the end of a cancelled operation - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeInt(mResult); - if (mLog != null) { - dest.writeTypedList(mLog.toList()); - } - } - - public static final Creator CREATOR = new Creator() { - public OperationResultParcel createFromParcel(final Parcel source) { - return new OperationResultParcel(source); - } - - public OperationResultParcel[] newArray(final int size) { - return new OperationResultParcel[size]; - } - }; - - public static class OperationLog implements Iterable { - - private final List mParcels = new ArrayList(); - - /// Simple convenience method - public void add(LogLevel level, LogType type, int indent, Object... parameters) { - mParcels.add(new OperationResultParcel.LogEntryParcel(level, type, indent, parameters)); - } - - public void add(LogLevel level, LogType type, int indent) { - mParcels.add(new OperationResultParcel.LogEntryParcel(level, type, indent, (Object[]) null)); - } - - public boolean containsType(LogType type) { - for(LogEntryParcel entry : new IterableIterator(mParcels.iterator())) { - if (entry.mType == type) { - return true; - } - } - return false; - } - - public boolean containsWarnings() { - for(LogEntryParcel entry : new IterableIterator(mParcels.iterator())) { - if (entry.mLevel == LogLevel.WARN || entry.mLevel == LogLevel.ERROR) { - return true; - } - } - return false; - } - - public void addAll(List parcels) { - mParcels.addAll(parcels); - } - - public List toList() { - return mParcels; - } - - public boolean isEmpty() { - return mParcels.isEmpty(); - } - - public LogEntryParcel getLast() { - if (mParcels.isEmpty()) { - return null; - } - return mParcels.get(mParcels.size() -1); - } - - @Override - public Iterator iterator() { - return mParcels.iterator(); - } - } - -} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SaveKeyringResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SaveKeyringResult.java index 0edb9c617..e229a5c6a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SaveKeyringResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SaveKeyringResult.java @@ -23,7 +23,7 @@ import android.os.Parcel; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing; -public class SaveKeyringResult extends OperationResultParcel { +public class SaveKeyringResult extends OperationResult { public final long mRingMasterKeyId; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java index 100a7c675..9d492e545 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SignEncryptResult.java @@ -19,12 +19,9 @@ package org.sufficientlysecure.keychain.service.results; import android.os.Parcel; -import org.openintents.openpgp.OpenPgpMetadata; -import org.openintents.openpgp.OpenPgpSignatureResult; - import java.util.Date; -public class SignEncryptResult extends OperationResultParcel { +public class SignEncryptResult extends OperationResult { // the fourth bit indicates a "data pending" result! (it's also a form of non-success) public static final int RESULT_PENDING = RESULT_ERROR +8; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SingletonResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SingletonResult.java index 5022c46a7..38b2e4bc3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SingletonResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SingletonResult.java @@ -27,7 +27,7 @@ import com.github.johnpersano.supertoasts.util.Style; /** This is a simple subclass meant to contain only a single log message. This log * message is also shown without a log button in the createNotify SuperToast. */ -public class SingletonResult extends OperationResultParcel { +public class SingletonResult extends OperationResult { /** Construct from a parcel - trivial because we have no extra data. */ public SingletonResult(Parcel source) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java index fb2184362..81fa98e7a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java @@ -54,8 +54,11 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainContract.UserIds; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.service.PassphraseCacheService; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; +import org.sufficientlysecure.keychain.service.results.SingletonResult; import org.sufficientlysecure.keychain.ui.adapter.UserIdsAdapter; import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment; import org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner; @@ -327,12 +330,10 @@ public class CertifyKeyFragment extends LoaderFragment if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { -// Notify.showNotify(CertifyKeyActivity.this, R.string.key_certify_success, -// Notify.Style.INFO); - - OperationResultParcel result = new OperationResultParcel(OperationResultParcel.RESULT_OK, null); + SingletonResult result = new SingletonResult( + SingletonResult.RESULT_OK, LogLevel.OK, LogType.MSG_CRT_SUCCESS); Intent intent = new Intent(); - intent.putExtra(OperationResultParcel.EXTRA_RESULT, result); + intent.putExtra(SingletonResult.EXTRA_RESULT, result); mActivity.setResult(CertifyKeyActivity.RESULT_OK, intent); // check if we need to send the key to the server or not @@ -383,12 +384,10 @@ public class CertifyKeyFragment extends LoaderFragment super.handleMessage(message); if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) { - //Notify.showNotify(CertifyKeyActivity.this, R.string.key_send_success, - //Notify.Style.INFO); - - OperationResultParcel result = new OperationResultParcel(OperationResultParcel.RESULT_OK, null); + SingletonResult result = new SingletonResult(SingletonResult.RESULT_OK, + LogLevel.OK, LogType.MSG_CRT_UPLOAD_SUCCESS); Intent intent = new Intent(); - intent.putExtra(OperationResultParcel.EXTRA_RESULT, result); + intent.putExtra(SingletonResult.EXTRA_RESULT, result); mActivity.setResult(CertifyKeyActivity.RESULT_OK, intent); mActivity.finish(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java index a645f18a9..dc9fa78e5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java @@ -39,7 +39,7 @@ import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; import org.sufficientlysecure.keychain.service.results.SaveKeyringResult; @@ -141,7 +141,7 @@ public class CreateKeyFinalFragment extends Fragment { return; } final SaveKeyringResult result = - returnData.getParcelable(OperationResultParcel.EXTRA_RESULT); + returnData.getParcelable(OperationResult.EXTRA_RESULT); if (result == null) { Log.e(Constants.TAG, "result == null"); return; @@ -152,7 +152,7 @@ public class CreateKeyFinalFragment extends Fragment { uploadKey(result); } else { Intent data = new Intent(); - data.putExtra(OperationResultParcel.EXTRA_RESULT, result); + data.putExtra(OperationResult.EXTRA_RESULT, result); getActivity().setResult(Activity.RESULT_OK, data); getActivity().finish(); } @@ -223,7 +223,7 @@ public class CreateKeyFinalFragment extends Fragment { //Notify.Style.INFO); Intent data = new Intent(); - data.putExtra(OperationResultParcel.EXTRA_RESULT, saveKeyResult); + data.putExtra(OperationResult.EXTRA_RESULT, saveKeyResult); getActivity().setResult(Activity.RESULT_OK, data); getActivity().finish(); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java index 8bde3f295..0911a98ae 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java @@ -48,9 +48,9 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.provider.ProviderHelper.NotFoundException; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogType; +import org.sufficientlysecure.keychain.service.results.OperationResult; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogType; import org.sufficientlysecure.keychain.service.results.SingletonResult; import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; @@ -541,8 +541,8 @@ public class EditKeyFragment extends LoaderFragment implements if (returnData == null) { return; } - final OperationResultParcel result = - returnData.getParcelable(OperationResultParcel.EXTRA_RESULT); + final OperationResult result = + returnData.getParcelable(OperationResult.EXTRA_RESULT); if (result == null) { return; } @@ -555,7 +555,7 @@ public class EditKeyFragment extends LoaderFragment implements // if good -> finish, return result to showkey and display there! Intent intent = new Intent(); - intent.putExtra(OperationResultParcel.EXTRA_RESULT, result); + intent.putExtra(OperationResult.EXTRA_RESULT, result); getActivity().setResult(EditKeyActivity.RESULT_OK, intent); getActivity().finish(); @@ -590,7 +590,7 @@ public class EditKeyFragment extends LoaderFragment implements // Prepare an intent with an EXTRA_RESULT Intent intent = new Intent(); - intent.putExtra(OperationResultParcel.EXTRA_RESULT, + intent.putExtra(OperationResult.EXTRA_RESULT, new SingletonResult(SingletonResult.RESULT_ERROR, LogLevel.ERROR, reason)); // Finish with result diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 732e59e32..d644dabc2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -46,7 +46,7 @@ import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.service.results.ImportKeyResult; import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter; import org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout; @@ -459,7 +459,7 @@ public class ImportKeysActivity extends ActionBarActivity { return; } final ImportKeyResult result = - returnData.getParcelable(OperationResultParcel.EXTRA_RESULT); + returnData.getParcelable(OperationResult.EXTRA_RESULT); if (result == null) { Log.e(Constants.TAG, "result == null"); return; diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java index 1b3bb06c3..4c94d25be 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java @@ -34,7 +34,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainDatabase; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.service.results.ConsolidateResult; import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Notify; @@ -166,7 +166,7 @@ public class KeyListActivity extends DrawerActivity { return; } final ConsolidateResult result = - returnData.getParcelable(OperationResultParcel.EXTRA_RESULT); + returnData.getParcelable(OperationResult.EXTRA_RESULT); if (result == null) { return; } @@ -201,8 +201,8 @@ public class KeyListActivity extends DrawerActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // if a result has been returned, display a notify - if (data != null && data.hasExtra(OperationResultParcel.EXTRA_RESULT)) { - OperationResultParcel result = data.getParcelableExtra(OperationResultParcel.EXTRA_RESULT); + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); result.createNotify(this).show(); } else { super.onActivityResult(requestCode, resultCode, data); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java index ddc57b8aa..fcd9324c9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java @@ -37,9 +37,9 @@ import android.widget.TextView; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogEntryParcel; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel.LogLevel; +import org.sufficientlysecure.keychain.service.results.OperationResult; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogEntryParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult.LogLevel; import org.sufficientlysecure.keychain.util.Log; import java.util.HashMap; @@ -50,7 +50,7 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener LogAdapter mAdapter; LogLevel mLevel = LogLevel.DEBUG; - OperationResultParcel mResult; + OperationResult mResult; GestureDetector mDetector; @@ -66,7 +66,7 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener return; } - mResult = intent.getParcelableExtra(EXTRA_RESULT); + mResult = intent.getParcelableExtra(EXTRA_RESULT); if (mResult == null) { getActivity().finish(); return; @@ -135,7 +135,7 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener private LayoutInflater mInflater; private int dipFactor; - public LogAdapter(Context context, OperationResultParcel.OperationLog log, LogLevel level) { + public LogAdapter(Context context, OperationResult.OperationLog log, LogLevel level) { super(context, R.layout.log_display_item); mInflater = LayoutInflater.from(getContext()); dipFactor = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index ef0b95bcc..805fc8753 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -56,7 +56,7 @@ import org.sufficientlysecure.keychain.pgp.PgpKeyHelper; import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.results.OperationResultParcel; +import org.sufficientlysecure.keychain.service.results.OperationResult; import org.sufficientlysecure.keychain.ui.adapter.PagerTabStripAdapter; import org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout; import org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout.TabColorizer; @@ -322,8 +322,8 @@ public class ViewKeyActivity extends ActionBarActivity implements @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { // if a result has been returned, display a notify - if (data != null && data.hasExtra(OperationResultParcel.EXTRA_RESULT)) { - OperationResultParcel result = data.getParcelableExtra(OperationResultParcel.EXTRA_RESULT); + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); result.createNotify(this).show(); } else { super.onActivityResult(requestCode, resultCode, data); diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index e1fcf4a0b..69bcca5a1 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -214,8 +214,6 @@ "%d bad secret keys ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead."" - "Successfully uploaded key to server" - "Successfully certified identities" "This list is empty!" "Successfully sent key with NFC Beam!" "Key has been copied to the clipboard!" @@ -827,6 +825,11 @@ "Starting sign and/or encrypt operation" "Preparing symmetric encryption" + "Successfully uploaded key to server" + "Successfully certified identities" + + "Account saved" + "Click to clear cached passphrases" "OpenKeychain has cached %d passphrases" -- cgit v1.2.3