Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make PassphraseCacheService a foreground service | Dominik Schürmann | 2014-07-27 | 1 | -72/+67 |
| | |||||
* | test and fix: adding an empty user id should fail | Vincent Breitmoser | 2014-07-26 | 1 | -0/+1 |
| | |||||
* | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -0/+2 |
| | |||||
* | Fallback if no primary user id exists | Dominik Schürmann | 2014-07-16 | 2 | -2/+2 |
| | |||||
* | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) | Vincent Breitmoser | 2014-07-15 | 1 | -2/+1 |
| | |||||
* | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -0/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-15 | 2 | -13/+139 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | Fixed misplaced bracket | Daniel Albert | 2014-07-12 | 1 | -1/+1 |
| | | |||||
| * | Fixed issues discussed in #713 | Daniel Albert | 2014-07-12 | 1 | -10/+10 |
| | | |||||
| * | Put text into strings.xml, for internationalization | Daniel Albert | 2014-07-12 | 1 | -6/+6 |
| | | |||||
| * | Added Purging for Android < 4.1 | Daniel Albert | 2014-07-12 | 1 | -28/+51 |
| | | |||||
| * | Implemented Notification, no fallback yet | Daniel Albert | 2014-07-12 | 2 | -4/+71 |
| | | |||||
| * | new PassphraseCache, storing UserIDs as well | Daniel Albert | 2014-07-12 | 1 | -11/+47 |
| | | |||||
* | | createKey: better logging, handle empty user id case | Vincent Breitmoser | 2014-07-12 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into external-test | Vincent Breitmoser | 2014-07-11 | 1 | -8/+8 |
|\| | | | | | | | | | | | | | Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java | ||||
| * | Fix OperationResultParcel | mar-v-in | 2014-07-09 | 1 | -8/+8 |
| | | | | | | Naming conventions save lives... or atleast make addAll() work | ||||
* | | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
| | | |||||
* | | SaveKeyringParcel: follow attribute m prefix coding guideline | Vincent Breitmoser | 2014-07-11 | 2 | -30/+30 |
| | | |||||
* | | test: get rid of some SaveKeyringParcel boilerplate | Vincent Breitmoser | 2014-07-11 | 1 | -5/+11 |
| | | |||||
* | | get rid of some inspection warnings | Vincent Breitmoser | 2014-07-11 | 1 | -4/+0 |
| | | |||||
* | | modifyKey: error out on nonexisting new primary user id | Vincent Breitmoser | 2014-07-11 | 1 | -0/+1 |
| | | |||||
* | | add come createKey strings | Vincent Breitmoser | 2014-07-11 | 1 | -1/+5 |
| | | |||||
* | | tests: add testSubkeyAdd | Vincent Breitmoser | 2014-07-10 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | 'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | ||||
| * | | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| |/ | |||||
* | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' | Vincent Breitmoser | 2014-07-07 | 1 | -0/+10 |
|\ \ | |/ |/| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java | ||||
| * | add toString for test ease | Art O Cathain | 2014-07-06 | 1 | -0/+10 |
| | | |||||
* | | Prefer composition to inheritance is the mantra these das | Art O Cathain | 2014-07-06 | 1 | -5/+25 |
|/ | |||||
* | parcel newPassphrase | Dominik Schürmann | 2014-07-03 | 1 | -0/+4 |
| | |||||
* | Work on edit | Dominik Schürmann | 2014-07-03 | 1 | -7/+7 |
| | |||||
* | merge KeychainIntentService | Dominik Schürmann | 2014-07-02 | 4 | -26/+55 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-07-02 | 1 | -16/+15 |
| |\ | |||||
| * \ | Merge branch 'create-keyring' | Vincent Breitmoser | 2014-07-02 | 4 | -25/+54 |
| |\ \ | |||||
| | * | | support changing primary user id in SaveKeyringParcel | Vincent Breitmoser | 2014-07-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Closes #695 | ||||
| | * | | fix subkey addition | Vincent Breitmoser | 2014-07-02 | 1 | -0/+3 |
| | | | | |||||
| | * | | add create key capabilities to SaveKeyringParcel | Vincent Breitmoser | 2014-06-29 | 3 | -25/+49 |
| | | | | |||||
* | | | | remove init methods from adapter | Dominik Schürmann | 2014-07-02 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-07-02 | 1 | -0/+1 |
|\| | | |||||
| * | | forgot a line in previous commit | Vincent Breitmoser | 2014-07-02 | 1 | -0/+1 |
| | | | |||||
* | | | Edit key: adding user ids | Dominik Schürmann | 2014-07-02 | 1 | -16/+15 |
|/ / | |||||
* / | work on edit key | Dominik Schürmann | 2014-06-30 | 1 | -1/+2 |
|/ | |||||
* | pass import results through to viewkeyactivity on update | Vincent Breitmoser | 2014-06-28 | 1 | -0/+93 |
| | |||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -13/+13 |
| | | | | closes #698 | ||||
* | new edit key: diff for existing user ids | Dominik Schürmann | 2014-06-22 | 1 | -0/+5 |
| | |||||
* | use arraylists instead of arrays in savekeyringparcel | Vincent Breitmoser | 2014-06-22 | 1 | -14/+14 |
| | |||||
* | Merge branch 'master' of https://github.com/open-keychain/open-keychain into ↵ | mar-v-in | 2014-06-19 | 1 | -0/+1 |
|\ | | | | | | | improve-file | ||||
| * | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into improve-file | mar-v-in | 2014-06-18 | 6 | -274/+464 |
|\| | |||||
| * | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-06-18 | 2 | -6/+23 |
| |\ | |||||
| | * | Merge pull request #661 from mar-v-in/improve-contacts | Dominik Schürmann | 2014-06-18 | 1 | -2/+20 |
| | |\ | | | | | | | | | Improve contact sync |