Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | allow state loss when yubikey fragment is loaded | Vincent Breitmoser | 2015-05-16 | 1 | -1/+2 |
| | |||||
* | yubikey: don't assume signing key is masterKeyId in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 2 | -41/+53 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | fix fragment handling in ViewKeyActivity | Vincent Breitmoser | 2015-05-16 | 1 | -28/+12 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
* | Removing unused SubkeyChange constructor. | Joey Castillo | 2015-05-13 | 1 | -12/+0 |
| | |||||
* | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 1 | -2/+2 |
| | |||||
* | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 2 | -0/+38 |
| | |||||
* | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 5 | -36/+39 |
| | |||||
* | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵ | Joey Castillo | 2015-05-13 | 4 | -32/+45 |
| | | | | keytocard; operation unsets it and fills in dummyDivert to finish it. | ||||
* | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 12 | -290/+236 |
| | |||||
* | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 4 | -50/+69 |
| | |||||
* | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 14 | -34/+615 |
| | |||||
* | 3.2.1 | Dominik Schürmann | 2015-05-10 | 1 | -1/+1 |
| | |||||
* | Fixing rotate crashes in create key | Dominik Schürmann | 2015-05-10 | 2 | -9/+5 |
| | |||||
* | Fix crash with v3 key fingerprints | Dominik Schürmann | 2015-05-10 | 1 | -1/+10 |
| | |||||
* | Cleanup | Dominik Schürmann | 2015-05-10 | 1 | -21/+0 |
| | |||||
* | Fixes and clarifications to app signature (or better certificate) pinning | Dominik Schürmann | 2015-05-10 | 4 | -38/+50 |
| | |||||
* | Add self-encrypt for old API | Dominik Schürmann | 2015-05-10 | 1 | -0/+14 |
| | |||||
* | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 3 | -1/+52 |
| | |||||
* | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 2 | -6/+18 |
| | |||||
* | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 2 | -62/+80 |
| | |||||
* | Rename for consistency | Dominik Schürmann | 2015-05-06 | 2 | -5/+4 |
| | |||||
* | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 1 | -6/+5 |
| | |||||
* | Move error overlay into generalized DecryptFragment, better error handling ↵ | Dominik Schürmann | 2015-05-06 | 4 | -41/+55 |
| | | | | in DecryptTextActivity | ||||
* | Switch to new library repos | Dominik Schürmann | 2015-05-06 | 6 | -7/+6 |
| | |||||
* | revert unneeded changes for short key ID | William Faulk | 2015-05-04 | 1 | -27/+3 |
| | |||||
* | revert unneeded changes for old temp Bluetooth share file | William Faulk | 2015-05-04 | 1 | -13/+0 |
| | |||||
* | use single file extension | William Faulk | 2015-05-04 | 1 | -1/+1 |
| | |||||
* | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 2 | -32/+18 |
| | |||||
* | Use FILE_EXTENSION constants | William Faulk | 2015-05-04 | 1 | -1/+1 |
| | |||||
* | Use primary user ID for filename instead of short key ID | William Faulk | 2015-05-04 | 1 | -2/+5 |
| | |||||
* | Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater | William Faulk | 2015-05-04 | 1 | -42/+44 |
| | |||||
* | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 3 | -9/+99 |
| | |||||
* | Fix revoked/expired state in decrypt activity | Dominik Schürmann | 2015-05-04 | 3 | -34/+24 |
| | |||||
* | Fix cancel/skip in create key wizard | Dominik Schürmann | 2015-05-04 | 3 | -52/+35 |
| | |||||
* | Display notify above keyboard in CreateKeyEmailFragment | Dominik Schürmann | 2015-05-04 | 1 | -2/+2 |
| | |||||
* | Fix email pattern | Dominik Schürmann | 2015-05-04 | 1 | -1/+1 |
| | |||||
* | Use more simple email validation regex | Dominik Schürmann | 2015-05-04 | 1 | -7/+8 |
| | |||||
* | Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 2 | -51/+93 |
|\ | | | | | | | | | | | | | 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 Ramos | 2015-04-30 | 1 | -10/+10 |
| | | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing | ||||
| * | -Removed unneeded view references from the fragment class since they are not ↵ | Daniel Ramos | 2015-04-26 | 1 | -7/+3 |
| | | | | | | | | | | | | used outside of createView. -cleanup | ||||
| * | -removed unneeded code from previous commits. I tested on a KitKat(4.4.2) ↵ | Daniel Ramos | 2015-04-26 | 1 | -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 Ramos | 2015-04-26 | 17 | -224/+533 |
| |\ | | | | | | | | | | into development | ||||
| * \ | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵ | Daniel Ramos | 2015-04-24 | 2 | -44/+89 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | ||||
| | * | | -Fixed a crash while recreating CreateKeyEmailFragment | Daniel Ramos | 2015-04-24 | 1 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | -Email data is properly restored while rotating the Activity. -Added necessary logic to guarantee that an email is actually valid before continuing, there are verifications for empty, duplicated and invalid formatted emails for both additional and main email. | ||||
| | * | | -Improved email sanity verifications when adding emails when creating a new Key | Daniel Ramos | 2015-04-14 | 3 | -30/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment. | ||||
* | | | | Fix dublicated code in CreateKeyEmailFragment | Dominik Schürmann | 2015-05-04 | 1 | -4/+0 |
| | | | | |||||
* | | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 1 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | into manojkhannakm-development | ||||
| * | | | | Espresso test for CreateKeyActivity | Manoj Khanna | 2015-04-25 | 1 | -5/+6 |
| | | | | | |||||
* | | | | | license header for PgpCertifyOperation | Dominik Schürmann | 2015-05-04 | 1 | -1/+19 |
| | | | | | |||||
* | | | | | Apply patch from ↵ | Dominik Schürmann | 2015-05-04 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 |