Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge pull request #1174 from Jesperbk/development | Dominik Schürmann | 2015-03-23 | 1 | -1/+3 | |
| |\ \ | | |/ | |/| | Fixed symmetric encryption crash | |||||
| | * | Fixed issue where setting a passphrase to null later causes a ↵ | JesperBK | 2015-03-23 | 1 | -1/+3 | |
| | | | | | | | | | | | | NullPointerException. | |||||
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-23 | 1 | -14/+23 | |
| |\ \ | | | | | | | | | | | | | development | |||||
| * | | | Use markdown for in-app help | Dominik Schürmann | 2015-03-23 | 3 | -17/+41 | |
| | |/ | |/| | ||||||
* | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 2 | -18/+39 | |
| | | | ||||||
* | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -5/+8 | |
| | | | ||||||
* | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | use top line in snackbar for status indication | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 | |
| |/ | ||||||
* | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 3 | -5/+49 | |
| | | ||||||
* | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 6 | -197/+329 | |
| | | ||||||
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -8/+9 | |
| | | ||||||
* | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 1 | -11/+102 | |
| | | ||||||
* | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 6 | -158/+259 | |
| | | ||||||
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 4 | -64/+137 | |
| | | ||||||
* | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 3 | -18/+270 | |
| | | ||||||
* | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 24 | -445/+585 | |
| | | | | | | | | | | - 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 | 17 | -176/+163 | |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | 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 | 17 | -173/+130 | |
| | | ||||||
| * | 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 | |||||
* | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 1 | -13/+47 | |
| | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | |||||
* | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 26 | -500/+498 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | Implemented #1162: Invoke NFC in Advanced View | Kent | 2015-03-20 | 2 | -154/+36 | |
| |/ | | | | | | | | | | | | | - 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 | 2 | -45/+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 | 1 | -40/+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 | |
| |/ | ||||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 17 | -65/+81 | |
| | | ||||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 5 | -89/+37 | |
| | | ||||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 5 | -43/+54 | |
| | | ||||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 3 | -62/+117 | |
| | | ||||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 4 | -24/+519 | |
| | | ||||||
* | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 1 | -1/+3 | |
|/ | ||||||
* | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 4 | -13/+15 | |
| | ||||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 3 | -8/+36 | |
| | ||||||
* | 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 | 20 | -88/+84 | |
| | ||||||
* | Fix nullpointer when scanning malformed qr codes | Dominik Schürmann | 2015-03-16 | 1 | -1/+1 | |
| | ||||||
* | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 2 | -2/+2 | |
| | ||||||
* | Remove display of key id in other lists | Dominik Schürmann | 2015-03-15 | 3 | -18/+65 | |
| | ||||||
* | Show main user id instead of key in certify screen | Dominik Schürmann | 2015-03-15 | 1 | -10/+15 | |
| | ||||||
* | Fixes for selection of certify key | Dominik Schürmann | 2015-03-15 | 2 | -10/+21 | |
| | ||||||
* | Merge pull request #1142 from tdjogi010/development | Dominik Schürmann | 2015-03-15 | 1 | -4/+10 | |
|\ | | | | | Preselected Suitable Key | |||||
| * | Preselected Suitable Key | tdjogi010@gmail.com | 2015-03-13 | 1 | -4/+10 | |
| | | ||||||
* | | Merge pull request #1147 from Hiperzone/development | Dominik Schürmann | 2015-03-15 | 1 | -1/+3 | |
|\ \ | | | | | | | -fixed out of bounds crash when retrieving the main profile name with se... | |||||
| * | | -fixed out of bounds crash when retrieving the main profile name with secret ↵ | Daniel Ramos | 2015-03-15 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | keys -fixed a possible crash when retrieving the main profile contactid |