aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
...
| | * | add toString for test easeArt O Cathain2014-07-061-0/+10
| | |/
| * / Prefer composition to inheritance is the mantra these dasArt O Cathain2014-07-061-5/+25
| |/
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-065-48/+82
|\|
| * parcel newPassphraseDominik Schürmann2014-07-031-0/+4
| * Work on editDominik Schürmann2014-07-031-7/+7
| * merge KeychainIntentServiceDominik Schürmann2014-07-024-26/+55
| |\
| | * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-07-021-16/+15
| | |\
| | * \ Merge branch 'create-keyring'Vincent Breitmoser2014-07-024-25/+54
| | |\ \
| | | * | support changing primary user id in SaveKeyringParcelVincent Breitmoser2014-07-021-0/+2
| | | * | fix subkey additionVincent Breitmoser2014-07-021-0/+3
| | | * | add create key capabilities to SaveKeyringParcelVincent Breitmoser2014-06-293-25/+49
| * | | | remove init methods from adapterDominik Schürmann2014-07-021-0/+1
| | |_|/ | |/| |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-021-0/+1
| |\| |
| | * | forgot a line in previous commitVincent Breitmoser2014-07-021-0/+1
| * | | Edit key: adding user idsDominik Schürmann2014-07-021-16/+15
| |/ /
* | | Add support for multiple input/output URIs to KeychainIntentServicemar-v-in2014-07-031-35/+56
* | | Merge branch 'master' into improve-file-moremar-v-in2014-07-012-13/+107
|\| |
| * | work on edit keyDominik Schürmann2014-06-301-1/+2
| |/
| * pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-0/+93
| * code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-13/+13
* | Merge branch 'master' into improve-file-moremar-v-in2014-06-241-0/+5
|\|
| * new edit key: diff for existing user idsDominik Schürmann2014-06-221-0/+5
* | Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-...mar-v-in2014-06-221-14/+14
|\|
| * use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
* | Improve file more, Part 1mar-v-in2014-06-221-5/+16
|/
* Merge branch 'master' of https://github.com/open-keychain/open-keychain into ...mar-v-in2014-06-191-0/+1
|\
| * canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-0/+1
* | Merge branch 'master' into improve-filemar-v-in2014-06-186-274/+464
|\|
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-06-182-6/+23
| |\
| | * Merge pull request #661 from mar-v-in/improve-contactsDominik Schürmann2014-06-181-2/+20
| | |\
| | | * Reset importDone at the beginning of syncmar-v-in2014-06-181-0/+1
| | | * Wait for import to be done before writing contactsmar-v-in2014-06-181-2/+19
| * | | Merge branch 'new-edit'Vincent Breitmoser2014-06-184-266/+53
| |\ \ \
| | * | | new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-172-1/+26
| | * | | new-edit: add new save keyring stuffVincent Breitmoser2014-06-171-3/+3
| | * | | new-edit: remove old save keyring stuffVincent Breitmoser2014-06-173-263/+23
| * | | | generate public keyring from secret if not availableVincent Breitmoser2014-06-181-2/+3
| | |/ / | |/| |
| * | | consolidate: almost sane loggingVincent Breitmoser2014-06-181-3/+4
| * | | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-1/+1
| * | | consolidate: make it workVincent Breitmoser2014-06-181-6/+6
| * | | consolidate: add loggingVincent Breitmoser2014-06-181-0/+11
| * | | prepare ProviderHelper for consolidation before insertVincent Breitmoser2014-06-181-2/+2
| * | | handle database error on secret key insertVincent Breitmoser2014-06-171-0/+1
| * | | canonicalize: support secret keysVincent Breitmoser2014-06-171-1/+3
| |/ /
| * | drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+2
| * | import-log: distinguish master/subkeys, distinguish redundant/bad certs, more...Vincent Breitmoser2014-06-161-7/+33
| * | Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-133-33/+222
| |\|
| * | canonicalize: require primary key binding certificates for signing subkeysVincent Breitmoser2014-06-121-0/+3
| * | canonicalize: simplify import with info from canonicalizationVincent Breitmoser2014-06-121-4/+0
| * | canonicalize: filter out future and local certificatesVincent Breitmoser2014-06-121-2/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 12:10:34 +0000