aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge pull request #603 from timbray/masterDominik Schürmann2014-05-0518-31/+676
| |\ \
| | * | Per pull-request comments.Tim Bray2014-05-047-45/+52
| | * | stupid identation stuffTim Bray2014-04-301-1/+1
| | * | tidy up IntentServiceTim Bray2014-04-301-2/+2
| | * | Changes should now be in sync with dominikTim Bray2014-04-301-4/+5
| | * | keybase ID stuffTim Bray2014-04-291-3/+8
| | * | Clean up debug crudTim Bray2014-04-292-4/+1
| | * | can search openkeychain, retrieve & install & use keys from thereTim Bray2014-04-2915-12/+647
| | |/
| * | Update from transifexDominik Schürmann2014-05-054-0/+240
| * | Update from transifexDominik Schürmann2014-05-0517-159/+44
| * | New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-0550-594/+1788
* | | wrapped-key-ring: remove more unneeded methodsVincent Breitmoser2014-05-043-112/+4
* | | wrapped-key-ring: get rid of bc objects in key editorVincent Breitmoser2014-05-0410-100/+98
* | | wrapped-key-ring: more work on passphrase caching and certificationVincent Breitmoser2014-05-044-98/+56
* | | wrapped-key-ring: introduce Uncached*Key objectsVincent Breitmoser2014-05-045-129/+179
* | | wrapped-key-ring: redesign underlying CachedKeyRingVincent Breitmoser2014-05-046-191/+153
* | | wrapped-key-ring: cached data revampVincent Breitmoser2014-05-041-33/+37
* | | wrapped-key-ring: view certifyVincent Breitmoser2014-05-042-17/+18
* | | wrapped-key-ring: no more pgp imports in PassphraseDialogFragmentVincent Breitmoser2014-05-046-87/+61
* | | wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentSer...Vincent Breitmoser2014-05-0314-269/+209
* | | wrapped-key-ring: small fix to make it work againVincent Breitmoser2014-05-032-14/+12
* | | wrapped-key-ring: forgot to add UncachedKeyRing classVincent Breitmoser2014-05-031-0/+29
* | | wrapped-key-ring: move more helper methods into keysVincent Breitmoser2014-05-035-15/+153
* | | wrapped-key-ring: move certification logic into secretkeyVincent Breitmoser2014-05-037-125/+118
* | | certification is always done with the master keyVincent Breitmoser2014-05-032-56/+1
* | | wrapped-key-ring: first steps, get rid of key imports in decryptverify and si...Vincent Breitmoser2014-05-0312-320/+744
|/ /
* / Update from transifexDominik Schürmann2014-05-0240-74/+1193
|/
* Merge pull request #601 from thi/rename-builder-methodsDominik Schürmann2014-04-294-58/+58
|\
| * Rename setter methods for PgpDecryptVerify.BuilderThialfihar2014-04-293-13/+13
| * Rename setter methods for PgpSignEncrypt.BuilderThialfihar2014-04-293-45/+45
* | Merge pull request #600 from thi/rename-progressdialogupdaterDominik Schürmann2014-04-298-54/+57
|\|
| * Rename ProgressDialogUpdater to ProgressableThialfihar2014-04-298-54/+57
| * Move util.ProgressDialogUpdater to pgp.ProgressableThialfihar2014-04-291-0/+0
* | Formatting KeychainDatabaseDominik Schürmann2014-04-291-17/+17
* | Clarify sqlite datatypesDominik Schürmann2014-04-291-2/+12
|/
* API: Fix GET_KEY, closes #599Dominik Schürmann2014-04-281-10/+13
* Many API fixes for GET_KEY and GET_KEY_IDSDominik Schürmann2014-04-283-17/+25
* Version 2.6.1Dominik Schürmann2014-04-222-2/+7
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-226-16/+34
|\
| * Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003'Vincent Breitmoser2014-04-221-1/+2
| |\
| | * fix nullpointer on missing s2kVincent Breitmoser2014-04-201-1/+2
| * | Merge commit '0b7fb70'Vincent Breitmoser2014-04-225-15/+32
| |\ \
| | * | split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-205-15/+32
* | | | add has_secret for all who are upgrading from a beta versionDominik Schürmann2014-04-221-3/+9
|/ / /
* | | Workaround for nullpointer bug in support lib, close #591Dominik Schürmann2014-04-2210-18/+52
* | | Fix a nullptr in KeychainProviderVincent Breitmoser2014-04-201-1/+1
| |/ |/|
* | More code cleanupDominik Schürmann2014-04-1920-105/+129
|/
* version 2.6Dominik Schürmann2014-04-191-2/+2
* Update from transifexDominik Schürmann2014-04-1926-106/+117
* better error string for too many responsesDominik Schürmann2014-04-191-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 21:06:49 +0000