Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Fix fingerprint length check in QR Code import | Dominik Schürmann | 2015-05-19 | 1 | -1/+1 | |
| | | ||||||
* | | Use Mode.ALPHANUMERIC for QR codes to save space | Dominik Schürmann | 2015-05-19 | 4 | -9/+24 | |
| | | ||||||
* | | Improve strings | Dominik Schürmann | 2015-05-19 | 2 | -6/+3 | |
| | | ||||||
* | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -12/+24 | |
| | | | | | | | | Fixes #1281 | |||||
* | | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-17 | 4 | -9/+15 | |
| | | ||||||
* | | open ViewKeyActivity by subkey in NfcBaseActivity | Vincent Breitmoser | 2015-05-17 | 1 | -3/+4 | |
| | | ||||||
* | | simplify MainActivity and fix backstack issues | Vincent Breitmoser | 2015-05-17 | 1 | -60/+33 | |
| | | ||||||
* | | re-parcel log in LogDisplayFragment | Vincent Breitmoser | 2015-05-17 | 1 | -6/+20 | |
| | | ||||||
* | | fingerprints are 20 bytes, not 40. duh. | Vincent Breitmoser | 2015-05-17 | 1 | -1/+1 | |
| | | ||||||
* | | load yubikey fragment after mMasterKeyId is available | Vincent Breitmoser | 2015-05-17 | 1 | -17/+33 | |
| | | ||||||
* | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -1/+8 | |
| | | ||||||
* | | pass masterKeyId to yubikey fragment | Vincent Breitmoser | 2015-05-16 | 2 | -6/+9 | |
| | | ||||||
* | | 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 | |||||
* | | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 1 | -2/+2 | |
| | | ||||||
* | | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 2 | -13/+22 | |
| | | ||||||
* | | Adding keytocard flag to SubkeyChange: UI sets this flag to initiate ↵ | Joey Castillo | 2015-05-13 | 2 | -12/+10 | |
| | | | | | | | | keytocard; operation unsets it and fills in dummyDivert to finish it. | |||||
* | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 4 | -105/+94 | |
| | | ||||||
* | | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 1 | -32/+9 | |
| | | ||||||
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 8 | -33/+457 | |
|/ | ||||||
* | 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 | |
| | ||||||
* | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 1 | -0/+2 | |
| | ||||||
* | Fix import of keyring with pub+sec key with same key id | Dominik Schürmann | 2015-05-06 | 1 | -51/+72 | |
| | ||||||
* | 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 | |
| | ||||||
* | use single file extension | William Faulk | 2015-05-04 | 1 | -1/+1 | |
| | ||||||
* | use TemporaryStorageProvider for Bluetooth Share | William Faulk | 2015-05-04 | 1 | -29/+12 | |
| | ||||||
* | 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 | 2 | -9/+86 | |
| | ||||||
* | 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. |