Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-23 | 5 | -16/+29 | |
| |\ \ \ | | | | | | | | | | | | | | | | development | |||||
| | * \ \ | Merge pull request #1170 from manojkhannakm/development | Dominik Schürmann | 2015-03-22 | 1 | -0/+0 | |
| | |\ \ \ | | | | | | | | | | | | | Updated openpgp-api-lib | |||||
| | | * | | | Updated openpgp-api-lib | Manoj Khanna | 2015-03-22 | 1 | -0/+0 | |
| | | |/ / | ||||||
| * | / / | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 83 | -7652/+524 | |
| | |/ / | |/| | | ||||||
* | | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 5 | -24/+78 | |
| | | | | ||||||
* | | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 2 | -5/+9 | |
| | | | | ||||||
* | | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 5 | -16/+29 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 5 | -16/+29 | |
| |/ / | ||||||
* | | | forgot spongycastle update | Vincent Breitmoser | 2015-03-22 | 1 | -0/+0 | |
| | | | ||||||
* | | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 2 | -6/+33 | |
| | | | ||||||
* | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 4 | -6/+51 | |
| | | | ||||||
* | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 9 | -221/+396 | |
| | | | ||||||
* | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 6 | -31/+24 | |
| | | | ||||||
* | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 3 | -14/+114 | |
| | | | ||||||
* | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 9 | -228/+376 | |
| | | | ||||||
* | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 20 | -88/+264 | |
| | | | ||||||
* | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 7 | -37/+365 | |
| | | | ||||||
* | | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 30 | -468/+689 | |
| | | | | | | | | | | | | | | | - 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 | 27 | -198/+215 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | | Merge branch 'manojkhannakm-development' into development | Dominik Schürmann | 2015-03-21 | 26 | -203/+184 | |
| |\ \ | ||||||
| | * | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵ | Dominik Schürmann | 2015-03-21 | 26 | -203/+184 | |
| |/| | | | | | | | | | | | | | | 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 | 2 | -9/+24 | |
| | | | | ||||||
| | * | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 25 | -197/+153 | |
| | | | | ||||||
| * | | | Add TODO to remote API | Dominik Schürmann | 2015-03-21 | 1 | -0/+2 | |
| |/ / | ||||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-20 | 1 | -2/+17 | |
| |\ \ | | | | | | | | | | | | | development | |||||
| | * \ | 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 | |||||
| * | / | Update api lib | Dominik Schürmann | 2015-03-20 | 1 | -0/+0 | |
| |/ / | ||||||
| * | | Update OpenPGP API lib | Dominik Schürmann | 2015-03-20 | 1 | -0/+0 | |
| | | | ||||||
| * | | Fix API RESULT_TYPE | Dominik Schürmann | 2015-03-20 | 2 | -3/+6 | |
| | | | ||||||
| * | | Fix PASSPHRASE handling in API | Dominik Schürmann | 2015-03-20 | 2 | -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 | 5 | -0/+17 | |
| | | | ||||||
* | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 7 | -20/+39 | |
| | | | ||||||
* | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 10 | -66/+56 | |
| | | | ||||||
* | | | inline mNfcSignOps variable | Vincent Breitmoser | 2015-03-20 | 1 | -17/+16 | |
| | | | ||||||
* | | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 4 | -21/+33 | |
| | | | ||||||
* | | | 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 | 86 | -819/+1217 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Merge pull request #1164 from kentnek/dev-nfc-advanced-view | Dominik Schürmann | 2015-03-20 | 9 | -158/+275 | |
| |\ \ | | |/ | |/| | Implemented #1071: Invoke NFC in Advanced View | |||||
| | * | 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 | 9 | -158/+261 | |
| |/ | | | | | | | | | | | | | - 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 | |||||
| | * | Merge pull request #1158 from manojkhannakm/development | Dominik Schürmann | 2015-03-19 | 3 | -60/+81 | |
| | |\ | | | | | | | | | Fixed a crash on ViewKeyActivity and Issue #1114 | |||||
| | | * | 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 | 35 | -430/+455 | |
| |/ |