aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-176-9/+66
* pass masterKeyId to yubikey fragmentVincent Breitmoser2015-05-162-6/+9
* allow state loss when yubikey fragment is loadedVincent Breitmoser2015-05-161-1/+2
* yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-162-41/+53
* fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-28/+12
* Removing unused SubkeyChange constructor.Joey Castillo2015-05-131-12/+0
* Moving blank smart card messages to strings.xmlJoey Castillo2015-05-131-2/+2
* Add check for exporting two keys to same smart card slot.Joey Castillo2015-05-132-0/+38
* Bugfixes and changes based on feedbackJoey Castillo2015-05-135-36/+39
* Adding keytocard flag to SubkeyChange: UI sets this flag to initiate keytocar...Joey Castillo2015-05-134-32/+45
* Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-1312-290/+236
* Moved checks from fragment to operation, impoved logging.Joey Castillo2015-05-124-50/+69
* Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-1214-34/+615
* 3.2.1Dominik Schürmann2015-05-101-1/+1
* Fixing rotate crashes in create keyDominik Schürmann2015-05-102-9/+5
* Fix crash with v3 key fingerprintsDominik Schürmann2015-05-101-1/+10
* CleanupDominik Schürmann2015-05-101-21/+0
* Fixes and clarifications to app signature (or better certificate) pinningDominik Schürmann2015-05-104-38/+50
* Add self-encrypt for old APIDominik Schürmann2015-05-101-0/+14
* fixed sync on key import, 'me' linked contact crashAdithya Abraham Philip2015-05-083-1/+52
* check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
* Fix import of keyring with pub+sec key with same key idDominik Schürmann2015-05-062-62/+80
* Rename for consistencyDominik Schürmann2015-05-062-5/+4
* Renaming for consisitencyDominik Schürmann2015-05-061-6/+5
* Move error overlay into generalized DecryptFragment, better error handling in...Dominik Schürmann2015-05-064-41/+55
* Switch to new library reposDominik Schürmann2015-05-066-7/+6
* revert unneeded changes for short key IDWilliam Faulk2015-05-041-27/+3
* revert unneeded changes for old temp Bluetooth share fileWilliam Faulk2015-05-041-13/+0
* use single file extensionWilliam Faulk2015-05-041-1/+1
* use TemporaryStorageProvider for Bluetooth ShareWilliam Faulk2015-05-042-32/+18
* Use FILE_EXTENSION constantsWilliam Faulk2015-05-041-1/+1
* Use primary user ID for filename instead of short key IDWilliam Faulk2015-05-041-2/+5
* Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greaterWilliam Faulk2015-05-041-42/+44
* Fix Bluetooth share without breaking othersWilliam Faulk2015-05-043-9/+99
* Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-043-34/+24
* Fix cancel/skip in create key wizardDominik Schürmann2015-05-043-52/+35
* Display notify above keyboard in CreateKeyEmailFragmentDominik Schürmann2015-05-041-2/+2
* Fix email patternDominik Schürmann2015-05-041-1/+1
* Use more simple email validation regexDominik Schürmann2015-05-041-7/+8
* Merge branch 'development' of https://github.com/Hiperzone/open-keychain into...Dominik Schürmann2015-05-042-51/+93
|\
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-301-10/+10
| * -Removed unneeded view references from the fragment class since they are not ...Daniel Ramos2015-04-261-7/+3
| * -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) and...Daniel Ramos2015-04-261-3/+0
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ...Daniel Ramos2015-04-2617-224/+533
| |\
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-242-44/+89
| |\ \
| | * | -Fixed a crash while recreating CreateKeyEmailFragmentDaniel Ramos2015-04-241-16/+16
| | * | -Improved email sanity verifications when adding emails when creating a new KeyDaniel Ramos2015-04-143-30/+79
* | | | Fix dublicated code in CreateKeyEmailFragmentDominik Schürmann2015-05-041-4/+0
* | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ...Dominik Schürmann2015-05-041-2/+6
|\ \ \ \
| * | | | Espresso test for CreateKeyActivityManoj Khanna2015-04-251-5/+6