aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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-2077-774/+1149
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-1817-230/+878
| | | | | | | | |
| * | | | | | | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-183-3/+64
| | | | | | | | |
* | | | | | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
| | | | | | | | |
* | | | | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-09225-8050/+10228
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-307-405/+423
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-272-12/+37
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | 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
| | |_|_|_|/ | |/| | | |
| * | | | | 3.2beta3Dominik Schürmann2015-03-232-3/+3
| | | | | |
| * | | | | translation fixesDominik Schürmann2015-03-238-113/+93
| | | | | |
| * | | | | Fix language problems reported by yahoe.001 on transifexDominik Schürmann2015-03-234-11/+16
| | | | | |
| * | | | | Pull from transifexDominik Schürmann2015-03-23113-209/+8859
| | | | | |
| * | | | | Remove remaining html entities in changelogDominik Schürmann2015-03-231-3/+3
| | | | | |
| * | | | | 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-2325-122/+691
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Multi-threaded key import, update all feature
| | * | | | | | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-2321-334/+611
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| | * | | | | | introduced multi-threadingAdithya Abraham Philip2015-03-236-35/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | Markdown commentsDominik Schürmann2015-03-235-5/+5
| | | | | | |
| * | | | | | Remove changelog in main folder, update commentsDominik Schürmann2015-03-234-0/+4
| | | | | | |
| * | | | | | 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-2381-7652/+522
| | |/ / / / | |/| | | |
* | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapterVincent Breitmoser2015-03-307-406/+423
| | | | | |
* | | | | | even more linked id ui workVincent Breitmoser2015-03-298-34/+38
| | | | | |
* | | | | | more (subtle) ui workVincent Breitmoser2015-03-264-39/+65
| | | | | |
* | | | | | more linked id ui fine tuningVincent Breitmoser2015-03-2617-0/+2
| | | | | |
* | | | | | some linked id ui fine tuningVincent Breitmoser2015-03-2639-153/+149
| | | | | |
* | | | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-247-25/+27
| | | | | |
* | | | | | work on cookie scanning during creationVincent Breitmoser2015-03-2412-153/+157
| | | | | |
* | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-24119-1201/+1770
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | | | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-14/+23
| |/ / / /
| * | | | Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵Dominik Schürmann2015-03-2125-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-2024-197/+153
| | | | | |
| * | | | | Add TODO to remote APIDominik Schürmann2015-03-211-0/+2
| |/ / / /