Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 6 | -67/+142 | |
| | | | ||||||
* | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 5 | -21/+278 | |
| | | | ||||||
* | | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 28 | -451/+589 | |
| | | | | | | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | |||||
* | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 25 | -193/+200 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-03-21 | 24 | -198/+169 | |
| |\ \ | | | | | | | | | | | | | into manojkhannakm-development | |||||
| | * | | Added docs for Notify class | Manoj Khanna | 2015-03-20 | 1 | -0/+10 | |
| | | | | ||||||
| | * | | Fixed Snackbar behind keyboard on ImportKeysActivity | Manoj Khanna | 2015-03-20 | 1 | -4/+9 | |
| | | | | ||||||
| | * | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 24 | -197/+153 | |
| | | | | ||||||
| * | | | Add TODO to remote API | Dominik Schürmann | 2015-03-21 | 1 | -0/+2 | |
| |/ / | ||||||
| * | | Merge pull request #1163 from kentnek/dev-list-footer | Dominik Schürmann | 2015-03-20 | 1 | -2/+17 | |
| |\ \ | | | | | | | | | Added a blank footer view to the list of keys | |||||
| | * | | - Added footer so that the Floating Action Button won't block the last few ↵ | Kent | 2015-03-20 | 1 | -2/+17 | |
| | |/ | | | | | | | | | | items' content | |||||
| * | | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 2 | -3/+6 | |
| | | | ||||||
| * | | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 1 | -2/+18 | |
| | | | ||||||
* | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 7 | -36/+110 | |
| | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | |||||
* | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 3 | -0/+10 | |
| | | | ||||||
* | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 4 | -5/+15 | |
| | | | ||||||
* | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 6 | -17/+17 | |
| | | | ||||||
* | | | inline mNfcSignOps variable | Vincent Breitmoser | 2015-03-20 | 1 | -17/+16 | |
| | | | ||||||
* | | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 3 | -3/+13 | |
| | | | ||||||
* | | | re-inline cryptoInput variable | Vincent Breitmoser | 2015-03-20 | 1 | -32/+34 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 47 | -603/+996 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | |||||
| * | | Updated GNU header | Kent | 2015-03-20 | 1 | -1/+2 | |
| | | | ||||||
| * | | Removed create and added GPLv3 header | Kent | 2015-03-20 | 1 | -4/+17 | |
| | | | ||||||
| * | | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 3 | -154/+240 | |
| |/ | | | | | | | | | | | | | - Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement) | |||||
| * | Remove on click on icon | Dominik Schürmann | 2015-03-19 | 1 | -0/+2 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 3 | -60/+81 | |
| |\ | | | | | | | | | | development | |||||
| | * | Fix for Issue #1114 | Manoj Khanna | 2015-03-19 | 1 | -5/+30 | |
| | | | | | | | | | | | | Displays the snackbar above the keyboard on all activities. | |||||
| | * | Fixed a crash on ViewKeyActivity | Manoj Khanna | 2015-03-19 | 2 | -55/+51 | |
| | | | | | | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity. | |||||
| * | | Manage my keys wizard | Dominik Schürmann | 2015-03-19 | 11 | -263/+323 | |
| |/ | ||||||
| * | Improve Passphrase class with finalize() | Dominik Schürmann | 2015-03-19 | 1 | -6/+34 | |
| | | ||||||
| * | Fix tests for Passphrase class | Dominik Schürmann | 2015-03-19 | 1 | -0/+4 | |
| | | ||||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-19 | 2 | -17/+27 | |
| |\ | | | | | | | | | | development | |||||
| | * | Added comments for server result sorting in key search | Max Mertens | 2015-03-18 | 1 | -0/+6 | |
| | | | ||||||
| | * | Show HKP server results first in key cloud search. Fixes #1066 | Max Mertens | 2015-03-18 | 1 | -1/+8 | |
| | | | ||||||
| * | | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 34 | -140/+307 | |
| | | | ||||||
* | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 16 | -247/+294 | |
| | | | ||||||
* | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 12 | -95/+147 | |
| | | | ||||||
* | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 14 | -239/+474 | |
| | | | ||||||
* | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 15 | -215/+857 | |
| | | | ||||||
* | | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 | |
| |/ |/| | ||||||
* | | contacts work on all supported api levels | Adithya Abraham Philip | 2015-03-17 | 1 | -16/+13 | |
|/ | ||||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-17 | 1 | -6/+2 | |
|\ | | | | | | | development | |||||
| * | removed unnecessary @TargetApi annotation | Adithya Abraham Philip | 2015-03-17 | 1 | -6/+2 | |
| | | ||||||
* | | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 5 | -13/+19 | |
|/ | ||||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 9 | -31/+117 | |
| | ||||||
* | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 4 | -6/+27 | |
| | ||||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 25 | -148/+139 | |
| | ||||||
* | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 | |
| | ||||||
* | Allow selection of none in SelectSignKeyIdActivity | Dominik Schürmann | 2015-03-15 | 1 | -2/+15 | |
| | ||||||
* | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 3 | -2/+7 | |
| |