aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Collapse)AuthorAgeFilesLines
* ui: apply purple theme (twi is best color)Vincent Breitmoser2014-05-062-2/+2
|
* ui: use textview buttons in decrypt verify dialogueVincent Breitmoser2014-05-062-6/+6
|
* ui: use textviews instead of bootstrap buttons in SignEncryptVincent Breitmoser2014-05-062-10/+9
|
* Touch view only onceDominik Schürmann2014-05-061-9/+11
|
* ui: use primary icon color for certification statusVincent Breitmoser2014-05-061-11/+8
|
* ui: show revocation and expiry status on info tabVincent Breitmoser2014-05-061-31/+40
|
* ui: subkey view redesignVincent Breitmoser2014-05-051-31/+13
|
* ui: remove primary subkey infoVincent Breitmoser2014-05-051-113/+7
|
* Merge pull request #609 from Vadiml1024/masterDominik Schürmann2014-05-051-2/+2
|\ | | | | Avoid displaying double 0x before keyid in ViewCertActivity
| * Avoid displaying double 0x before keyid in ViewCertActivityVadim Lebedev2014-05-021-2/+2
| |
* | Fix license headerDominik Schürmann2014-05-051-12/+11
| |
* | Merge pull request #603 from timbray/masterDominik Schürmann2014-05-0515-31/+621
|\ \ | | | | | | Adds first level of keybase support
| * | 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-2912-12/+592
| |/
* / New key view design, using Android flat buttons and Android iconsDominik Schürmann2014-05-0511-276/+1305
|/
* Merge pull request #601 from thi/rename-builder-methodsDominik Schürmann2014-04-294-58/+58
|\ | | | | Rename builder methods
| * 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
| * Rename ProgressDialogUpdater to ProgressableThialfihar2014-04-298-54/+57
| | | | | | | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders.
| * 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
| | | | | | | | | | | | Fixes #590
| * | Merge commit '0b7fb70'Vincent Breitmoser2014-04-224-15/+31
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml
| | * | split up filterSign and filterCertify in SelectSecretKeyFragmentVincent Breitmoser2014-04-204-15/+31
| | | | | | | | | | | | | | | | Closes #588
* | | | 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
| |/ |/| | | | | Fixes #589
* | 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
| | | | Closes #575