aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-266-506/+531
| |
* | Fix certify with CryptoInputParcelDominik Schürmann2015-03-253-10/+6
| |
* | Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
| |
* | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-2432-186/+753
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
| * Pull from transifexDominik Schürmann2015-03-233-10/+10
| |
| * Merge pull request #1165 from kentnek/dev-yubikey-nullDominik Schürmann2015-03-231-5/+11
| |\ | | | | | | Fixed #1152: NullPointerException when signing with YubiKey
| | * Fixed #1152:Kent2015-03-201-5/+11
| | | | | | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding.
| * | Merge pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-2322-122/+681
| |\ \ | | | | | | | | Multi-threaded key import, update all feature
| | * | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2320-334/+608
| | | | | | | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| | * | introduced multi-threadingAdithya Abraham Philip2015-03-234-35/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
| * | | Fix passphrase cache not clearing all passphrasesDominik Schürmann2015-03-231-2/+2
| | | |
| * | | Merge pull request #1174 from Jesperbk/developmentDominik Schürmann2015-03-231-1/+3
| |\ \ \ | | |/ / | |/| | Fixed symmetric encryption crash
| | * | Fixed issue where setting a passphrase to null later causes a ↵JesperBK2015-03-231-1/+3
| | | | | | | | | | | | | | | | NullPointerException.
| * | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-231-14/+23
| |\ \ \ | | | | | | | | | | | | | | | development
| * | | | Use markdown for in-app helpDominik Schürmann2015-03-233-17/+41
| | |/ / | |/| |
* | | | further improve yubikey error handlingVincent Breitmoser2015-03-234-24/+77
| | | |
* | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
| | | |
* | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
|\ \ \ \ | | |/ / | |/| |
| * | | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| |/ /
* | | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-221-0/+4
| | |
* | | enable nfc in import dialog as wellVincent Breitmoser2015-03-223-5/+49
| | |
* | | finish ui flow for yubikey importVincent Breitmoser2015-03-227-198/+330
| | |
* | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-225-30/+21
| | |
* | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-221-11/+102
| | |
* | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-226-158/+259
| | |
* | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-216-67/+142
| | |
* | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-215-21/+278
| | |
* | | first steps toward yubikey activityVincent Breitmoser2015-03-2128-451/+589
| | | | | | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2125-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ürmann2015-03-2124-198/+169
| |\ \ | | | | | | | | | | | | into manojkhannakm-development
| | * | Added docs for Notify classManoj Khanna2015-03-201-0/+10
| | | |
| | * | Fixed Snackbar behind keyboard on ImportKeysActivityManoj Khanna2015-03-201-4/+9
| | | |
| | * | Reworked Notify classManoj Khanna2015-03-2024-197/+153
| | | |
| * | | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/ /
| * | 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
| * | Fix API RESULT_TYPEDominik Schürmann2015-03-202-3/+6
| | |
| * | Fix PASSPHRASE handling in APIDominik Schürmann2015-03-201-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-203-0/+10
| | |
* | | fix unit tests (for real)Vincent Breitmoser2015-03-204-5/+15
| | |
* | | fix more unit tests (syntax)Vincent Breitmoser2015-03-206-17/+17
| | |
* | | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
| | |
* | | fix unit tests (syntax)Vincent Breitmoser2015-03-203-3/+13
| | |
* | | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
| | |
* | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2047-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 headerKent2015-03-201-1/+2
| | |
| * | Removed create and added GPLv3 headerKent2015-03-201-4/+17
| | |
| * | Implemented #1162: Invoke NFC in Advanced ViewKent2015-03-203-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 iconDominik Schürmann2015-03-191-0/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-01 18:48:28 +0000