aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-171-6/+2
|\ | | | | | | development
| * Merge pull request #1154 from adithyaphilip/developmentDominik Schürmann2015-03-161-6/+2
| |\ | | | | | | Removed unnecessary @TargetApi annotation in ContactHelper
| | * removed unnecessary @TargetApi annotationAdithya Abraham Philip2015-03-171-6/+2
| |/
* / File extensions into ConstantsDominik Schürmann2015-03-175-13/+19
|/
* Disable hidden recipients for nowDominik Schürmann2015-03-162-10/+10
|
* Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-1613-33/+133
|
* Allow encrypt of filenames via overflow menuDominik Schürmann2015-03-167-11/+44
|
* Remove old info from readmeDominik Schürmann2015-03-161-2/+0
|
* Remove old info from readmeDominik Schürmann2015-03-161-28/+5
|
* Clarify certification help screenDominik Schürmann2015-03-161-2/+2
|
* Update api libDominik Schürmann2015-03-161-0/+0
|
* Update api libDominik Schürmann2015-03-161-0/+0
|
* object oriented split user idDominik Schürmann2015-03-161-0/+53
|
* object oriented split user idDominik Schürmann2015-03-1626-148/+139
|
* Update openpgp-api libDominik Schürmann2015-03-161-0/+0
|
* Fix nullpointer when scanning malformed qr codesDominik Schürmann2015-03-161-1/+1
|
* Allow selection of none in SelectSignKeyIdActivityDominik Schürmann2015-03-152-2/+37
|
* Clarify MIME usageDominik Schürmann2015-03-153-2/+7
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-152-15/+22
|\ | | | | | | development
| * fix expiry of master keysVincent Breitmoser2015-03-152-15/+22
| | | | | | | | fixes #1141
* | Put API activites in normal process to allow hydrate/dehydrate of logsDominik Schürmann2015-03-151-4/+2
|/
* Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
|
* Add ignore dirty to other git submodulesDominik Schürmann2015-03-151-2/+9
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 09:41:39 +0000