aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* zxing lib is now on jcenter, see ↵Dominik Schürmann2015-05-151-5/+0
| | | | https://github.com/journeyapps/zxing-android-embedded/issues/39
* Merge pull request #1278 from josecastillo/nfckeytocardVincent2015-05-1529-80/+734
|\ | | | | Support for moving RSA keys to Yubikey or NFC smart card
| * Removing unused SubkeyChange constructor.Joey Castillo2015-05-132-36/+4
| |
| * Moving blank smart card messages to strings.xmlJoey Castillo2015-05-132-2/+4
| |
| * Adding unit tests for PgpKeyOperation keytocard functionality.Joey Castillo2015-05-131-1/+64
| |
| * 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
|
* Add dontnote to proguardDominik Schürmann2015-05-101-1/+2
|
* Workaround for Samsung Android 4.2 bugDominik Schürmann2015-05-102-0/+33
|
* Use snackbar lib from maven repoDominik Schürmann2015-05-104-5/+2
|
* 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
|
* Merge pull request #1270 from adithyaphilip/linked-contact-crashDominik Schürmann2015-05-093-1/+52
|\ | | | | Fixed sync on key import, crash for 'me' linked contact
| * fixed sync on key import, 'me' linked contact crashAdithya Abraham Philip2015-05-083-1/+52
|/
* Update contrib section in READMEDominik Schürmann2015-05-081-5/+9
|
* Version 3.2Dominik Schürmann2015-05-0624-25/+25
|
* Add screenshotsDominik Schürmann2015-05-068-2/+2
|
* Pull from transifexDominik Schürmann2015-05-0610-141/+163
|
* Update function graphicDominik Schürmann2015-05-062-584/+92
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-062-6/+18
|\ | | | | | | development
| * check for fingerprint of any subkey (arguable?)Vincent Breitmoser2015-05-062-6/+18
| |
* | Update openpgp-api libDominik Schürmann2015-05-061-0/+0
|/
* 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
* Remove reference to deleted API DemoDominik Schürmann2015-05-061-6/+0
|
* Switch to new library reposDominik Schürmann2015-05-0611-11/+12
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-05-053-9/+54
|\ | | | | | | development
| * Merge pull request #1235 from wfaulk/replacement_extraDominik Schürmann2015-05-043-9/+54
| |\ | | | | | | Fix Bluetooth share without breaking others
| | * 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 13:24:06 +0000