Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix yubikey for signAndEncrypt via API | Dominik Schürmann | 2014-09-07 | 1 | -0/+6 |
| | |||||
* | Remove SelectSecretKey, not used anymore | Dominik Schürmann | 2014-09-07 | 1 | -1/+0 |
| | |||||
* | Due to compatiblity switch from SHA512 to SHA256 | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 |
| | |||||
* | Save account on back press and with notify | Dominik Schürmann | 2014-09-07 | 3 | -7/+25 |
| | |||||
* | Drawer nav method cleanup | Dominik Schürmann | 2014-09-06 | 1 | -1/+1 |
| | |||||
* | Fix possible nullpointer in AppsListFragment | Dominik Schürmann | 2014-09-02 | 1 | -2/+1 |
| | |||||
* | Prepare API for OpenPgpSignatureResult extensions | Dominik Schürmann | 2014-08-31 | 1 | -4/+12 |
| | |||||
* | Better leyout for account settings | Dominik Schürmann | 2014-08-31 | 2 | -31/+20 |
| | |||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 5 | -105/+141 |
|\ | | | | | | | | | | | | | 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 | ||||
| * | API: Fix re-seletion of keys on default account | Dominik Schürmann | 2014-08-23 | 2 | -9/+16 |
| | | |||||
| * | Fix result handling in account settings | Dominik Schürmann | 2014-08-21 | 1 | -13/+10 |
| | | |||||
| * | return some more results | Dominik Schürmann | 2014-08-20 | 1 | -0/+12 |
| | | |||||
| * | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -2/+2 |
| | | |||||
| * | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix ↵ | Dominik Schürmann | 2014-08-16 | 2 | -68/+88 |
| | | | | | | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables | ||||
| * | do not pre-select revoked or expired keys | Dominik Schürmann | 2014-08-16 | 1 | -6/+12 |
| | | |||||
| * | Fix encrypt only | Dominik Schürmann | 2014-08-16 | 1 | -9/+2 |
| | | |||||
| * | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -2/+0 |
| | | |||||
* | | Support for multiple hash algos | Dominik Schürmann | 2014-08-14 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 3 | -42/+124 |
|\| | | | | | | | | | | | | | | | 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 | ||||
| * | API: Return metadata only for v4 api clients and above... | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| | | |||||
| * | API: Return metadata only for v4 api clients | Dominik Schürmann | 2014-08-14 | 1 | -3/+5 |
| | | |||||
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -2/+2 |
| | | |||||
| * | API: User interaction when account keys are deleted | Dominik Schürmann | 2014-08-13 | 3 | -24/+66 |
| | | |||||
| * | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -7/+9 |
| | | |||||
| * | Fix DECRYPT_METADATA api | Dominik Schürmann | 2014-08-12 | 1 | -9/+21 |
| | | |||||
| * | Fix API version support, update api lib | Dominik Schürmann | 2014-08-12 | 1 | -2/+4 |
| | | |||||
| * | Implement EXTRA_ORIGINAL_FILENAME for API | Dominik Schürmann | 2014-08-11 | 1 | -1/+6 |
| | | |||||
| * | Update api lib | Dominik Schürmann | 2014-08-11 | 1 | -2/+2 |
| | | |||||
| * | Decrypt metadata api | Dominik Schürmann | 2014-08-11 | 1 | -3/+17 |
| | | |||||
| * | Support API versions 3 and 4 | Dominik Schürmann | 2014-08-11 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 2 | -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 | -1/+2 |
| | | |||||
| * | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 2 | -7/+8 |
|\| | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-30 | 1 | -2/+0 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | ||||
| | * | some more work on supertoast and result parcel stuff | Vincent Breitmoser | 2014-07-27 | 1 | -7/+4 |
| | | | |||||
| * | | Create key with fragments | Dominik Schürmann | 2014-07-30 | 1 | -5/+8 |
| |/ | |||||
* | | Remove support for V3 signatures | Dominik Schürmann | 2014-07-22 | 1 | -2/+0 |
| | | |||||
* | | Cleanup | Dominik Schürmann | 2014-07-22 | 1 | -12/+7 |
| | | |||||
* | | Reuse signature creation timestamp for synchronous signing | Dominik Schürmann | 2014-07-22 | 1 | -5/+8 |
| | | |||||
* | | NFC Yubikey: only pass through hash of message and not whole content | Dominik Schürmann | 2014-07-21 | 1 | -3/+7 |
| | | |||||
* | | Fixes | Dominik Schürmann | 2014-07-17 | 2 | -5/+43 |
|/ | |||||
* | Fix nullpointer in API, fix #693 | Dominik Schürmann | 2014-07-08 | 1 | -1/+7 |
| | |||||
* | Remove old edit button, rename activities | Dominik Schürmann | 2014-07-03 | 1 | -5/+5 |
| | |||||
* | Added new button style and converted account_settings and the ↵ | Daniel Albert | 2014-06-29 | 1 | -4/+3 |
| | | | | select_secret_key_layout to use it | ||||
* | wrapped-key-ring: use CachedKeyRing where possible | Vincent Breitmoser | 2014-05-21 | 1 | -2/+4 |
| | |||||
* | 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 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 3 | -20/+55 |
|\ | | | | | | | | | | | | | | | | | 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 |