aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Collapse)AuthorAgeFilesLines
* Fix nullpointer with getS2K()Dominik Schürmann2014-10-021-1/+2
|
* code styleDominik Schürmann2014-10-021-5/+5
|
* Add null check when retrieving key ids from contacts apiDominik Schürmann2014-10-021-0/+7
|
* Add workaround for bug #912Dominik Schürmann2014-10-021-0/+7
|
* Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling ↵Dominik Schürmann2014-10-012-16/+27
| | | | in decryt screen
* More debugging outputDominik Schürmann2014-10-014-25/+79
|
* check key ids when used from apiDominik Schürmann2014-10-011-6/+8
|
* 3.0 beta3Dominik Schürmann2014-09-301-4/+7
|
* fix minor logic error (haha)Vincent Breitmoser2014-09-301-1/+1
|
* fix ByteBuffer offset mistake in NfcActivityVincent Breitmoser2014-09-301-1/+2
|
* pass (encryption) key id from Decrypt*Fragment to NfcActivityVincent Breitmoser2014-09-306-20/+42
|
* pass key id for check from EncryptActivity to NfcActivityVincent Breitmoser2014-09-303-4/+13
|
* add (optional) keyId check in NfcActivityVincent Breitmoser2014-09-301-5/+20
|
* revamp fingerprint and keyid methods in NfcActivityVincent Breitmoser2014-09-301-18/+47
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-305-10/+15
|\
| * Fix nullpointer in DecryptActivityDominik Schürmann2014-09-291-4/+8
| |
| * Fixes for share to decryptDominik Schürmann2014-09-292-4/+5
| |
| * Maybe fixes encrypt files on tabletsDominik Schürmann2014-09-292-2/+2
| |
* | request passphrase for correct subkey in OpenPgpServiceVincent Breitmoser2014-09-301-7/+8
|/ | | | fixes #811, hopefully
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-294-7/+2
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/AndroidManifest.xml
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-294-123/+169
| |\
| * | Fix NfcActivity task stack problemDominik Schürmann2014-09-294-7/+2
| | |
* | | add barely functional nfc intent activity (WIP!)Vincent Breitmoser2014-09-291-0/+312
| | |
* | | add class for proper nfc tlv packet parsingVincent Breitmoser2014-09-291-0/+195
| |/ |/|
* | fix method visibility for testsVincent Breitmoser2014-09-282-33/+37
| |
* | move can.*() methods to CanonicalizedPublicKey, where they belongVincent Breitmoser2014-09-283-81/+83
| |
* | be more mindful of algorithm and usage flag interactionVincent Breitmoser2014-09-283-16/+42
| | | | | | | | Fixes #895
* | only check for primary binding certificate if key algorithm even supports ↵Vincent Breitmoser2014-09-281-9/+15
| | | | | | | | signing
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-283-8/+20
|\|
| * Hide keyboard after cloud searchDominik Schürmann2014-09-271-0/+13
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-272-1/+11
| |\
| * | Dont show keyboard by default in key creation to allow the user to get an ↵Dominik Schürmann2014-09-272-8/+7
| | | | | | | | | | | | overview what to type, use spannable where possible
* | | Reject subkeys with no key flags and no primary key binding certificateVincent Breitmoser2014-09-281-27/+35
| |/ |/| | | | | Closes #899
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-263-43/+96
|\ \
| * | Fix bug where Keybase extraData gets lost when SKS wins the search race.Tim Bray2014-09-251-0/+10
| |/
| * Fixes for new app listDominik Schürmann2014-09-242-43/+86
| |
* | nfc: use proper hex encoding for pin lengthVincent Breitmoser2014-09-261-1/+1
|/ | | | Fixes #886
* disable pull to refresh (for now)Vincent Breitmoser2014-09-241-2/+6
|
* fix save button when no file is selectedVincent Breitmoser2014-09-241-0/+4
|
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-241-26/+141
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-241-5/+6
| |\
| * | propose apps in apps listDominik Schürmann2014-09-241-26/+141
| | |
* | | show message about saving multiple files rather than hide the buttonVincent Breitmoser2014-09-241-23/+8
| | |
* | | move more stuff into EncryptActivity superclassVincent Breitmoser2014-09-243-226/+147
| | |
* | | use correct pin for nfc in EncryptActivityVincent Breitmoser2014-09-244-3/+15
| | |
* | | allow 1024 bit key signaturesVincent Breitmoser2014-09-241-3/+2
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-09-242-27/+38
|\|
| * Fix logging in NFcActivityDominik Schürmann2014-09-242-27/+38
| |
* | fix Le fields in APDUsVincent Breitmoser2014-09-241-5/+6
|/
* Fix yubikey pin lengths other than 6Vincent Breitmoser2014-09-241-1/+1
| | | | Closes #883