Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |||||
| * | proper null checks and closing of cursors everywhere | Vincent Breitmoser | 2014-05-08 | 1 | -13/+19 | |
| | | ||||||
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 1 | -2/+2 | |
| | | ||||||
| * | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 1 | -4/+24 | |
| | | ||||||
| * | GET_KEY: also return PendingIntent to key view | Dominik Schürmann | 2014-05-07 | 1 | -1/+10 | |
| | | ||||||
* | | wrapped-key-ring: get rid of bc objects in key editor | Vincent Breitmoser | 2014-05-04 | 1 | -1/+1 | |
|/ | ||||||
* | Rename setter methods for PgpDecryptVerify.Builder | Thialfihar | 2014-04-29 | 1 | -3/+3 | |
| | ||||||
* | Rename setter methods for PgpSignEncrypt.Builder | Thialfihar | 2014-04-29 | 1 | -15/+15 | |
| | ||||||
* | API: Fix GET_KEY, closes #599 | Dominik Schürmann | 2014-04-28 | 1 | -10/+13 | |
| | ||||||
* | Many API fixes for GET_KEY and GET_KEY_IDS | Dominik Schürmann | 2014-04-28 | 1 | -9/+23 | |
| | ||||||
* | Translations from transifex, fix some strings references | Dominik Schürmann | 2014-04-16 | 1 | -2/+2 | |
| | ||||||
* | Handle new exceptions in remote service | Dominik Schürmann | 2014-04-16 | 1 | -7/+44 | |
| | ||||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 2 | -2/+1 | |
| | ||||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 3 | -7/+5 | |
| | ||||||
* | Remove unused blob classes and other dead code | Dominik Schürmann | 2014-04-13 | 3 | -28/+16 | |
| | ||||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 6 | -6/+6 | |
| | ||||||
* | More changes to PgpSignEncrypt | Dominik Schürmann | 2014-04-12 | 1 | -0/+4 | |
| | ||||||
* | PgpDecryptVerify is now context-free | Dominik Schürmann | 2014-04-11 | 1 | -1/+10 | |
| | ||||||
* | PgpSignEncrypt is now context-free | Dominik Schürmann | 2014-04-11 | 1 | -2/+9 | |
| | ||||||
* | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 6 | -29/+31 | |
| | | | | context (first commit to get context out of pgp classes) | |||||
* | Remove queries from PgpKeyHelper, introduce encrypt to signer mode (not tested) | Dominik Schürmann | 2014-04-11 | 1 | -4/+4 | |
| | ||||||
* | split getMasterKeyId for the remaining use cases | Vincent Breitmoser | 2014-04-11 | 1 | -1/+2 | |
| | | | | Closes #549 | |||||
* | Introduce ProviderHelper.NotFoundException, remove dead code | Dominik Schürmann | 2014-04-08 | 1 | -2/+8 | |
| | ||||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 13 | -0/+2169 | |