aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* 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-0313-269/+208
* 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
* 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
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-225-16/+33
|\
| * 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-224-15/+31
| |\ \
| | * | split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-204-15/+31
* | | | 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-221-2/+3
* | | Fix a nullptr in KeychainProviderVincent Breitmoser2014-04-201-1/+1
| |/ |/|
* | More code cleanupDominik Schürmann2014-04-1919-95/+116
|/
* Trying a fix for #585Dominik Schürmann2014-04-193-17/+21
* Fix some smaller annoyances, closes #583, #582Dominik Schürmann2014-04-192-11/+5
* Fix more stringsDominik Schürmann2014-04-192-3/+3
* fix unified query columns for select*fragmentVincent Breitmoser2014-04-182-6/+5
* Remove unused strings, fix some lint errors, fix some language confusionsDominik Schürmann2014-04-188-10/+12
* Do not show lookup button in decrypt activity for decryption-onlyDominik Schürmann2014-04-181-2/+4
* FIx nfc buttonDominik Schürmann2014-04-182-7/+14
* Fix upload of keys, closes #581Dominik Schürmann2014-04-182-3/+8
* Remove kill hack in KeychainDatabaseDominik Schürmann2014-04-171-9/+0
* Remove dev hack in KeychainDatabaseDominik Schürmann2014-04-171-5/+0
* get rid of PgpKeyHelper.getMasterKeyIdVincent Breitmoser2014-04-174-33/+21
* NotFoundExceptions for all getGeneric-type methodsVincent Breitmoser2014-04-177-121/+160
* load data only once in ImportKeysListLoaderVincent Breitmoser2014-04-171-3/+7
* add up navigation in ViewCertActivityVincent Breitmoser2014-04-172-0/+11
* use project icons for certification statusVincent Breitmoser2014-04-172-6/+6
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-171-4/+12
|\
| * secret keys can only be deleted individually from multi selectionVincent Breitmoser2014-04-171-4/+12
* | Rename provider types following http://developer.android.com/guide/topics/pro...Dominik Schürmann2014-04-171-12/+35
|/
* Use git submodules for libs, fix compilation, remove library sourcecodeDominik Schürmann2014-04-162-8/+4
* Merge pull request #576 from Valodim/stripped-secretkeysDominik Schürmann2014-04-1610-30/+108
|\
| * Fix even more whitespaceVincent2014-04-161-1/+1
| * Fix more whitespaceVincent2014-04-161-2/+2