aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
* simplify MainActivity and fix backstack issuesVincent Breitmoser2015-05-171-60/+33
* re-parcel log in LogDisplayFragmentVincent Breitmoser2015-05-171-6/+20
* fingerprints are 20 bytes, not 40. duh.Vincent Breitmoser2015-05-171-1/+1
* load yubikey fragment after mMasterKeyId is availableVincent Breitmoser2015-05-171-17/+33
* apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-177-9/+69
* pass masterKeyId to yubikey fragmentVincent Breitmoser2015-05-172-6/+9
* allow state loss when yubikey fragment is loadedVincent Breitmoser2015-05-171-1/+2
* yubikey: don't assume signing key is masterKeyId in ViewKeyActivityVincent Breitmoser2015-05-172-41/+53
* fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-171-28/+12
* 3.2.1Dominik Schürmann2015-05-102-3/+3
* 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
* Reformat manifestDominik Schürmann2015-05-101-23/+23
* 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
* Version 3.2Dominik Schürmann2015-05-0624-25/+25
* Pull from transifexDominik Schürmann2015-05-0610-141/+163
* 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-062-11/+10
* Move error overlay into generalized DecryptFragment, better error handling in...Dominik Schürmann2015-05-065-117/+181
* Switch to new library reposDominik Schürmann2015-05-066-7/+6
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-05-053-9/+54
|\
| * 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-044-9/+100
* | Cleanup manifestDominik Schürmann2015-05-051-15/+16
* | Fix nullpointer in file decryptionDominik Schürmann2015-05-051-1/+1
|/
* Fix revoked/expired state in decrypt activityDominik Schürmann2015-05-044-37/+27
* 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-043-51/+94
|\
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-303-12/+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-2641-450/+770
| |\
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into de...Daniel Ramos2015-04-245-44/+92
| |\ \
| | * | -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-146-30/+82
* | | | Fix dublicated code in CreateKeyEmailFragmentDominik Schürmann2015-05-041-4/+0