aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into improve-file-moremar-v-in2014-08-011-8/+14
|\
| * Remve cacheing of keyrings (cleanup of #726)Dominik Schürmann2014-08-011-5/+0
| * Merge pull request #726 from mar-v-in/fix-import-from-serverDominik Schürmann2014-08-011-3/+14
| |\
| | * Undo import changesmar-v-in2014-08-011-3/+27
| | * Fix import from servermar-v-in2014-08-011-30/+17
* | | Merge branch 'master' into improve-file-moremar-v-in2014-08-011-0/+5
|\| |
| * | Fix update from keyserverDominik Schürmann2014-07-311-0/+5
| |/
* | Merge branch 'master' into improve-file-moremar-v-in2014-07-316-124/+414
|\|
| * completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-311-2/+2
| * Parcelable data over 1MB can not be send through binder, parcel into a cache ...Dominik Schürmann2014-07-311-7/+6
| * avoid nullpointerexception in EditKeyResultVincent Breitmoser2014-07-311-2/+2
| * Keyserver exception translateableDominik Schürmann2014-07-311-1/+1
| * couple of logging fixesVincent Breitmoser2014-07-311-2/+1
| * rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-313-12/+11
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-07-301-0/+1
| |\
| | * couple of fixes in save*KeyRing methodsVincent Breitmoser2014-07-301-0/+1
| * | Create key: work on uploadDominik Schürmann2014-07-301-0/+9
| |/
| * return values for create keyDominik Schürmann2014-07-301-4/+2
| * Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-294-42/+158
| |\
| | * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-273-26/+69
| | * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-273-20/+33
| | * Merge branch 'master' into ditch-appmsgVincent Breitmoser2014-07-264-50/+224
| | |\
| | * | use SuperToast instead of AppMsg in code, part 2Vincent Breitmoser2014-07-072-3/+64
| | * | use SuperToast instead of AppMsg in code, part 1Vincent Breitmoser2014-07-071-4/+3
| * | | Make PassphraseCacheService a foreground serviceDominik Schürmann2014-07-271-72/+67
| | |/ | |/|
| * | test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+1
| * | canonicalize: fix for testsVincent Breitmoser2014-07-191-0/+2
| * | Fallback if no primary user id existsDominik Schürmann2014-07-162-2/+2
| * | move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-151-2/+1
| * | merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-0/+1
| * | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-152-13/+139
| |\ \
| | * | Fixed misplaced bracketDaniel Albert2014-07-121-1/+1
| | * | Fixed issues discussed in #713Daniel Albert2014-07-121-10/+10
| | * | Put text into strings.xml, for internationalizationDaniel Albert2014-07-121-6/+6
| | * | Added Purging for Android < 4.1Daniel Albert2014-07-121-28/+51
| | * | Implemented Notification, no fallback yetDaniel Albert2014-07-122-4/+71
| | * | new PassphraseCache, storing UserIDs as wellDaniel Albert2014-07-121-11/+47
| * | | createKey: better logging, handle empty user id caseVincent Breitmoser2014-07-121-0/+5
| * | | Merge remote-tracking branch 'origin/master' into external-testVincent Breitmoser2014-07-111-8/+8
| |\| |
| | * | 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
| |\ \ \ | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 21:38:13 +0000