aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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
| * | | | | | | 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
| * | | | | | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-2016-247/+294
| | | | | | | | |
| * | | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-1912-95/+147
| | | | | | | | |
| * | | | | | | | yubikey certifications!Vincent Breitmoser2015-03-1814-239/+474
| | | | | | | | |
| * | | | | | | | generalize nfc crypto input structureVincent Breitmoser2015-03-1816-230/+872
| | | | | | | | |
| * | | | | | | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-183-3/+64
| | | | | | | | |
* | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-0933-182/+864
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-392/+400
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
| * | | | | | | Merge pull request #1188 from adithyaphilip/import-message-errorDominik Schürmann2015-03-281-2/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Corrected import error message, changed style to WARN
| | * | | | | | | changed style to WARN, corrected error messageAdithya Abraham Philip2015-03-281-2/+5
| | | |_|_|_|_|/ | | |/| | | | |
| * / | | | | | -Fixed a situation where additional emails could be duplicated when creating ↵Daniel Ramos2015-03-271-12/+36
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations.
| * | | | | | Modify break as return.iseki2015-03-261-1/+1
| | | | | | |
| * | | | | | Add brackets for if-else constructs and externalize the procedure as ↵iseki2015-03-261-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | showMultiExportDialog.
| * | | | | | Add a loop for multiple key export.iseki2015-03-251-13/+68
| | |_|_|_|/ | |/| | | |
| * | | | | 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
| | |/ / / / | |/| | | |
* | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-304-393/+400
| | | | | |
* | | | | | even more linked id ui workVincent Breitmoser2015-03-295-28/+29
| | | | | |
* | | | | | more (subtle) ui workVincent Breitmoser2015-03-262-9/+38
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 08:55:22 +0000