aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* Add info about device with intent chooser bugDominik Schürmann2014-08-211-1/+1
* 2.8 beta3Dominik Schürmann2014-08-211-2/+2
* Disable custom intent chooserDominik Schürmann2014-08-211-53/+54
* 2.8 beta2Dominik Schürmann2014-08-211-2/+2
* Fix nullpointer when revoking keysDominik Schürmann2014-08-211-1/+2
* Add account only on jelly bean and aboveDominik Schürmann2014-08-212-8/+15
* No need for setSyncAutomatically, this is only for network ticklesDominik Schürmann2014-08-211-3/+5
* Add sync propertiesDominik Schürmann2014-08-212-2/+7
* Change account typeDominik Schürmann2014-08-216-9/+12
* XML cleanupDominik Schürmann2014-08-217-79/+11
* v2.8 beta1Dominik Schürmann2014-08-211-2/+2
* Pull from transifexDominik Schürmann2014-08-216-42/+22
* cleanupDominik Schürmann2014-08-211-71/+0
* Fix result handling in account settingsDominik Schürmann2014-08-212-16/+13
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-215-41/+70
|\
| * Comment extra in requestSyncDominik Schürmann2014-08-201-0/+1
| * Sync in KeychainIntentService on delete, import, saveDominik Schürmann2014-08-202-0/+21
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-208-51/+133
| |\
| * | Enable sync adapter, changelogDominik Schürmann2014-08-203-2/+8
| * | Disable key import in sync adapterDominik Schürmann2014-08-201-38/+39
| * | improve certs_textDominik Schürmann2014-08-201-1/+1
* | | Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-2131-2/+31
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-204-13/+8
|\|
| * Upload key workingDominik Schürmann2014-08-204-13/+8
* | small change to make android studio recognize a honeycomb-only blockVincent Breitmoser2014-08-201-2/+4
* | move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-204-40/+104
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-207-33/+49
|\|
| * Upload key workingDominik Schürmann2014-08-201-0/+3
| * Fix key sharingDominik Schürmann2014-08-201-3/+1
| * Work on upload keyDominik Schürmann2014-08-201-14/+24
| * Notify duration, cleanupDominik Schürmann2014-08-202-9/+4
| * Fix nullpointer in first time activityDominik Schürmann2014-08-201-1/+3
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-202-3/+3
| |\
| * | return some more resultsDominik Schürmann2014-08-202-6/+14
* | | consolidate: small ui thingsVincent Breitmoser2014-08-202-1/+6
* | | make number of secret keys imported part of ImportResult parcelVincent Breitmoser2014-08-202-5/+11
* | | close actionmode in keylist on loading events (avoid inconsistent state)Vincent Breitmoser2014-08-201-0/+10
* | | consolidate: remove debug "breakpoint"Vincent Breitmoser2014-08-201-5/+0
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-202-9/+7
|\|
| * progress dialog design fixDominik Schürmann2014-08-202-9/+7
* | modifyKey: small logging changesVincent Breitmoser2014-08-202-3/+3
|/
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-204-91/+115
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-207-19/+30
| |\
| * | consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-204-91/+115
* | | return some more resultsDominik Schürmann2014-08-206-35/+41
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-208-54/+74
|\|
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-2015-76/+135
| |\
| * | consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-205-49/+67
| * | consolidate: use KeychainProvider for deletion operationVincent Breitmoser2014-08-204-5/+7
* | | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-207-19/+30
| |/ |/|