Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -8/+5 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -5/+8 |
| | |||||
* | pass key id for check from EncryptActivity to NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -1/+3 |
| | |||||
* | use correct pin for nfc in EncryptActivity | Vincent Breitmoser | 2014-09-24 | 1 | -1/+1 |
| | |||||
* | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 1 | -0/+2 |
| | |||||
* | Fix nfc signing | Dominik Schürmann | 2014-09-18 | 1 | -1/+1 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -3/+4 |
| | | | | created ui.util for everything related to formatting | ||||
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -13/+36 |
| | |||||
* | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 1 | -23/+22 |
| | |||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -4/+4 |
| | |||||
* | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 1 | -0/+1 |
| | |||||
* | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 1 | -163/+179 |
| | |||||
* | Set literal data format tag to UTF8 when encrypting text | Dominik Schürmann | 2014-09-13 | 1 | -1/+7 |
| | |||||
* | add some comments to previous commit | Vincent Breitmoser | 2014-09-10 | 1 | -0/+1 |
| | |||||
* | jury-rig broken sign mechanism | Vincent Breitmoser | 2014-09-09 | 1 | -10/+24 |
| | | | | Should improve situation on #811 | ||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 1 | -10/+10 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | Fix encrypt only | Dominik Schürmann | 2014-08-16 | 1 | -10/+10 |
| | | |||||
| * | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -80/+10 |
| | | |||||
* | | Support for multiple hash algos | Dominik Schürmann | 2014-08-14 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 1 | -42/+67 |
|\| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java | ||||
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -4/+10 |
| | | |||||
| * | Add option to pass original filename to PgpSignEncrypt | Dominik Schürmann | 2014-08-11 | 1 | -12/+20 |
| | | |||||
| * | progress for signing binary | Dominik Schürmann | 2014-08-11 | 1 | -15/+27 |
| | | |||||
| * | Introduction of metadata api, starting to fix decryption progress | Dominik Schürmann | 2014-08-10 | 1 | -9/+9 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -2/+3 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | Use CompressionAlgorithmTags instead of homebrew constants | Dominik Schürmann | 2014-08-05 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -5/+5 |
|\| | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | ||||
| * | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -5/+5 |
| | | |||||
* | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 1 | -90/+14 |
| | | |||||
* | | Reuse signature creation timestamp for synchronous signing | Dominik Schürmann | 2014-07-22 | 1 | -22/+19 |
| | | |||||
* | | NFC Yubikey: only pass through hash of message and not whole content | Dominik Schürmann | 2014-07-21 | 1 | -38/+38 |
| | | |||||
* | | Fixes | Dominik Schürmann | 2014-07-17 | 1 | -19/+74 |
|/ | |||||
* | use long rather than String to build uris by key | Vincent Breitmoser | 2014-05-21 | 1 | -1/+1 |
| | |||||
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -5/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -2/+0 |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | use setEncryptToSigner for asymmetric encryption | Vincent Breitmoser | 2014-05-08 | 1 | -2/+0 |
| | | | | | | | | (tested and works, closes #569) | ||||
* | | wrapped-key-ring: redesign underlying CachedKeyRing | Vincent Breitmoser | 2014-05-04 | 1 | -4/+5 |
| | | |||||
* | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -55/+27 |
|/ | | | | signencrypt | ||||
* | Rename setter methods for PgpSignEncrypt.Builder | Thialfihar | 2014-04-29 | 1 | -19/+19 |
| | |||||
* | Rename ProgressDialogUpdater to Progressable | Thialfihar | 2014-04-29 | 1 | -10/+10 |
| | | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders. | ||||
* | get rid of PgpKeyHelper.getMasterKeyId | Vincent Breitmoser | 2014-04-17 | 1 | -2/+5 |
| | | | | Closes #575 | ||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 1 | -5/+4 |
| | |||||
* | Handle new exceptions in KeychainIntentService | Dominik Schürmann | 2014-04-13 | 1 | -6/+0 |
| | |||||
* | More changes to PgpSignEncrypt | Dominik Schürmann | 2014-04-12 | 1 | -37/+39 |
| | |||||
* | PgpSignEncrypt comment | Dominik Schürmann | 2014-04-11 | 1 | -0/+2 |
| | |||||
* | Clarify use of methods in PgpKeyHelper | Dominik Schürmann | 2014-04-11 | 1 | -2/+2 |
| | |||||
* | Remove some Ids... | Dominik Schürmann | 2014-04-11 | 1 | -9/+1 |
| | |||||
* | put signatureType where it belongs | Dominik Schürmann | 2014-04-11 | 1 | -8/+8 |
| | |||||
* | PgpSignEncrypt is now context-free | Dominik Schürmann | 2014-04-11 | 1 | -17/+35 |
| | |||||
* | PgpSignEncrypt: merge generateSignature() into main method | Dominik Schürmann | 2014-04-11 | 1 | -127/+79 |
| |