aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* fix fragment handling in ViewKeyActivityVincent Breitmoser2015-05-161-28/+12
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
* Removing unused SubkeyChange constructor.Joey Castillo2015-05-131-12/+0
|
* Moving blank smart card messages to strings.xmlJoey Castillo2015-05-132-2/+4
|
* Add check for exporting two keys to same smart card slot.Joey Castillo2015-05-133-0/+40
|
* Bugfixes and changes based on feedbackJoey Castillo2015-05-135-36/+39
|
* Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵Joey Castillo2015-05-134-32/+45
| | | | keytocard; operation unsets it and fills in dummyDivert to finish it.
* Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-1313-290/+239
|
* 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-1227-34/+631
|
* 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 ↵Dominik Schürmann2015-05-065-117/+181
| | | | in DecryptTextActivity
* Switch to new library reposDominik Schürmann2015-05-066-7/+6
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-053-9/+54
|\ | | | | | | development
| * 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 ↵Dominik Schürmann2015-05-043-51/+94
|\ | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
| * -removed unneeded inputType attribute from xml files (+1 squashed commits)Daniel Ramos2015-04-303-12/+10
| | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing
| * -Removed unneeded view references from the fragment class since they are not ↵Daniel Ramos2015-04-261-7/+3
| | | | | | | | | | | | used outside of createView. -cleanup
| * -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵Daniel Ramos2015-04-261-3/+0
| | | | | | | | and Lollipop (5.1) phone and everything seems to be preserved as expected.
| * Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Daniel Ramos2015-04-2641-450/+770
| |\ | | | | | | | | | into development
| * \ Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵Daniel Ramos2015-04-245-44/+92
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 01:12:46 +0000