aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Fix OperationResultParcelmar-v-in2014-07-091-8/+8
* | | | | | | modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-111-0/+1
* | | | | | | SaveKeyringParcel: follow attribute m prefix coding guidelineVincent Breitmoser2014-07-112-30/+30
* | | | | | | test: get rid of some SaveKeyringParcel boilerplateVincent Breitmoser2014-07-111-5/+11
* | | | | | | get rid of some inspection warningsVincent Breitmoser2014-07-111-4/+0
* | | | | | | modifyKey: error out on nonexisting new primary user idVincent Breitmoser2014-07-111-0/+1
* | | | | | | add come createKey stringsVincent Breitmoser2014-07-111-1/+5
* | | | | | | tests: add testSubkeyAddVincent Breitmoser2014-07-101-0/+1
* | | | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-bads...Vincent Breitmoser2014-07-091-0/+1
|\ \ \ \ \ \ \
| * | | | | | | add toString for test easeArt O Cathain2014-07-061-0/+10
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'Vincent Breitmoser2014-07-071-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|/ / / / /
* | | | | 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
|/ / / / /
* / / / / 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
| |_|/ |/| |
* | | new edit key: diff for existing user idsDominik Schürmann2014-06-221-0/+5
| |/ |/|
* | use arraylists instead of arrays in savekeyringparcelVincent Breitmoser2014-06-221-14/+14
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 03:50:27 +0000