Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | couple of logging fixes | Vincent Breitmoser | 2014-07-31 | 1 | -2/+0 |
| | |||||
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -7/+7 |
| | |||||
* | Create key: repeat passphrase | Dominik Schürmann | 2014-07-30 | 1 | -5/+0 |
| | |||||
* | Redesigned QR Code view | Dominik Schürmann | 2014-07-27 | 1 | -111/+0 |
| | |||||
* | Open keyboard on passphrase dialog, this should now work on all Android ↵ | Dominik Schürmann | 2014-07-27 | 2 | -27/+92 |
| | | | | versions... hopefully | ||||
* | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-12 | 1 | -3/+12 |
|\ | |||||
| * | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -2/+2 |
| | | |||||
| * | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 1 | -3/+12 |
| | | |||||
* | | more work on edit key | Dominik Schürmann | 2014-07-12 | 1 | -0/+187 |
|/ | |||||
* | Work on subkeys adapter | Dominik Schürmann | 2014-07-08 | 1 | -0/+110 |
| | |||||
* | Use strings in edit key | Dominik Schürmann | 2014-07-03 | 1 | -3/+4 |
| | |||||
* | fix no passphrase check | Dominik Schürmann | 2014-07-03 | 1 | -1/+3 |
| | |||||
* | Cache passphrase for edit | Dominik Schürmann | 2014-07-03 | 1 | -19/+46 |
| | |||||
* | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -5/+3 |
| | |||||
* | edit key: part 3 | Dominik Schürmann | 2014-07-01 | 1 | -165/+0 |
| | |||||
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain | Daniel Albert | 2014-06-30 | 1 | -30/+87 |
|\ | |||||
| * | new edit key: first version to add user ids | Dominik Schürmann | 2014-06-24 | 1 | -30/+87 |
| | | |||||
* | | Updated file_dialog to use the new buttons | Daniel Albert | 2014-06-29 | 1 | -4/+3 |
|/ | |||||
* | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 2 | -0/+217 |
| | |||||
* | Delete using Document API (unsafe) | mar-v-in | 2014-06-10 | 1 | -0/+24 |
| | |||||
* | Use Document API on KitKat for file encrypt/decrypt | mar-v-in | 2014-06-10 | 1 | -15/+43 |
| | |||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -1/+1 |
| | |||||
* | new savekeyring operation (mostly stub) | Vincent Breitmoser | 2014-05-27 | 1 | -1/+1 |
| | |||||
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -10/+17 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 10 | -151/+74 |
|\ | | | | | | | | | | | | | | | | | 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 | ||||
| * | ui: purplize dialog headers (huge hack inside) | Vincent Breitmoser | 2014-05-08 | 10 | -23/+58 |
| | | |||||
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 1 | -1/+1 |
| | | |||||
| * | Remove code for sharing whole key via qr code | Dominik Schürmann | 2014-05-07 | 1 | -127/+15 |
| | | |||||
* | | wrapped-key-ring: more work on passphrase caching and certification | Vincent Breitmoser | 2014-05-04 | 1 | -2/+6 |
| | | |||||
* | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragment | Vincent Breitmoser | 2014-05-04 | 1 | -70/+47 |
|/ | |||||
* | More code cleanup | Dominik Schürmann | 2014-04-19 | 3 | -7/+4 |
| | |||||
* | Trying a fix for #585 | Dominik Schürmann | 2014-04-19 | 1 | -15/+21 |
| | |||||
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 1 | -0/+2 |
| | |||||
* | get rid of PgpKeyHelper.getMasterKeyId | Vincent Breitmoser | 2014-04-17 | 1 | -3/+6 |
| | | | | Closes #575 | ||||
* | NotFoundExceptions for all getGeneric-type methods | Vincent Breitmoser | 2014-04-17 | 2 | -50/+64 |
| | |||||
* | stripped support: add has_secret column to keys table | Vincent Breitmoser | 2014-04-16 | 1 | -2/+2 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-04-15 | 8 | -1/+8 |
| | |||||
* | Removing remaining uses of Id, closing one of the oldest bugs #9 | Dominik Schürmann | 2014-04-14 | 2 | -15/+15 |
| | |||||
* | Update license header for 2014 | Dominik Schürmann | 2014-04-13 | 7 | -7/+7 |
| | |||||
* | Simplify and fix delete key dialog | Dominik Schürmann | 2014-04-11 | 1 | -22/+6 |
| | |||||
* | Refactor ProviderHelper to be non-static using a constructor based on ↵ | Dominik Schürmann | 2014-04-11 | 3 | -8/+10 |
| | | | | context (first commit to get context out of pgp classes) | ||||
* | split getMasterKeyId for the remaining use cases | Vincent Breitmoser | 2014-04-11 | 1 | -2/+2 |
| | | | | Closes #549 | ||||
* | get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString | Vincent Breitmoser | 2014-04-11 | 1 | -10/+13 |
| | |||||
* | Hide keyboard after hiding custom key length field | Dominik Schürmann | 2014-04-09 | 1 | -1/+9 |
| | |||||
* | Merge pull request #539 from gogowitczak/custom-key-length-info | Dominik Schürmann | 2014-04-09 | 1 | -37/+84 |
|\ | | | | | Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions. | ||||
| * | Modified Spinner values for CreateKeyDialog. Added info for user about ↵ | gogowitczak | 2014-04-08 | 1 | -37/+84 |
| | | | | | | | | custom key length restrictions. | ||||
* | | Use NotFoundException in more places | Dominik Schürmann | 2014-04-08 | 1 | -6/+11 |
| | | |||||
* | | Introduce ProviderHelper.NotFoundException, remove dead code | Dominik Schürmann | 2014-04-08 | 1 | -1/+7 |
|/ | |||||
* | Fixed coding style. | gogowitczak | 2014-04-08 | 1 | -3/+6 |
| |