aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* work on ad-hoc yubikey import supportVincent Breitmoser2015-03-217-37/+365
|
* first steps toward yubikey activityVincent Breitmoser2015-03-2130-468/+689
| | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2127-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 developmentDominik Schürmann2015-03-2126-203/+184
| |\
| | * Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵Dominik Schürmann2015-03-2126-203/+184
| |/| | | | | | | | | | into manojkhannakm-development
| | * Added docs for Notify classManoj Khanna2015-03-201-0/+10
| | |
| | * Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-202-9/+24
| | |
| | * Reworked Notify classManoj Khanna2015-03-2025-197/+153
| | |
| * | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-201-2/+17
| |\ | | | | | | | | | development
| | * Merge pull request #1163 from kentnek/dev-list-footerDominik Schürmann2015-03-201-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 ↵Kent2015-03-201-2/+17
| | | | | | | | | | | | | | | | items' content
| * | | Update api libDominik Schürmann2015-03-201-0/+0
| |/ /
| * | Update OpenPGP API libDominik Schürmann2015-03-201-0/+0
| | |
| * | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
| | |
| * | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-202-2/+18
| | |
* | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-217-36/+110
| | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* | | add edit key unit test for no-opVincent Breitmoser2015-03-205-0/+17
| | |
* | | fix unit tests (for real)Vincent Breitmoser2015-03-207-20/+39
| | |
* | | fix more unit tests (syntax)Vincent Breitmoser2015-03-2010-66/+56
| | |
* | | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
| | |
* | | fix unit tests (syntax)Vincent Breitmoser2015-03-204-21/+33
| | |
* | | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
| | |
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2086-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-viewDominik Schürmann2015-03-209-158/+275
| |\ \ | | |/ | |/| Implemented #1071: Invoke NFC in Advanced View
| | * Updated GNU headerKent2015-03-201-1/+2
| | |
| | * Removed create and added GPLv3 headerKent2015-03-201-4/+17
| | |
| | * Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-209-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 iconDominik Schürmann2015-03-191-0/+2
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-193-60/+81
| |\ | | | | | | | | | development
| | * Merge pull request #1158 from manojkhannakm/developmentDominik Schürmann2015-03-193-60/+81
| | |\ | | | | | | | | Fixed a crash on ViewKeyActivity and Issue #1114
| | | * Fix for Issue #1114Manoj Khanna2015-03-191-5/+30
| | | | | | | | | | | | | | | | Displays the snackbar above the keyboard on all activities.
| | | * Fixed a crash on ViewKeyActivityManoj Khanna2015-03-192-55/+51
| | |/ | | | | | | | | | | | | This occurs when deleting a key with a stripped master key from the ViewKeyActivity.
| * / Manage my keys wizardDominik Schürmann2015-03-1935-430/+455
| |/
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| |
| * Fix headerDominik Schürmann2015-03-191-1/+2
| |
| * Fix tests for Passphrase classDominik Schürmann2015-03-1910-45/+71
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-192-17/+27
| |\ | | | | | | | | | development
| | * Merge pull request #1160 from jellysheep/cloudsearch-show-main-emailDominik Schürmann2015-03-181-1/+14
| | |\ | | | | | | | | Show HKP server results first in key cloud search. Fixes #1066
| | | * Added comments for server result sorting in key searchMax Mertens2015-03-181-0/+6
| | | |
| | | * Show HKP server results first in key cloud search. Fixes #1066Max Mertens2015-03-181-1/+8
| | |/
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-1934-140/+307
| | |
* | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-2017-248/+296
| | |
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-1912-95/+147
| | |
* | | yubikey certifications!Vincent Breitmoser2015-03-1815-240/+475
| | |
* | | generalize nfc crypto input structureVincent Breitmoser2015-03-1818-235/+883
| | |
* | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-183-3/+64
| |/ |/|
* | Merge pull request #1155 from adithyaphilip/developmentDominik Schürmann2015-03-171-16/+13
|\ \ | |/ |/| Removed JellyBean restriction on Contact Sync
| * contacts work on all supported api levelsAdithya Abraham Philip2015-03-171-16/+13
|/
* Manifest cleanupDominik Schürmann2015-03-171-9/+12
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 10:11:54 +0000