aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* rename LinkedIdentity to LinkedAttributeVincent Breitmoser2015-05-125-13/+13
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-1140-384/+692
|\
| * 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
| * | | | | license header for PgpCertifyOperationDominik Schürmann2015-05-041-1/+19
| * | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#i...Dominik Schürmann2015-05-041-2/+9
| * | | | | Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 w...Dominik Schürmann2015-05-041-8/+22
| * | | | | More nullpointer fixesDominik Schürmann2015-05-011-1/+1
| * | | | | Fix nullpointer in EncryptKeyCompletionViewDominik Schürmann2015-05-011-2/+2
| * | | | | Remove time from key creation displayDominik Schürmann2015-04-301-1/+0
| * | | | | Fix key creation string and displayDominik Schürmann2015-04-303-25/+10
| * | | | | API: Allow selection of decryption keys when decryption failsDominik Schürmann2015-04-303-6/+144
| * | | | | fix crash when moving focus from EncryptKeyCompletionView with unknown textVincent Breitmoser2015-04-281-1/+1
| * | | | | display unknown keys red rather than orangeVincent Breitmoser2015-04-281-1/+1
| * | | | | fix "select all" in key list multi-selectVincent Breitmoser2015-04-281-1/+1