aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
* | | | more linked id ui fine tuningVincent Breitmoser2015-03-261-0/+2
| | | |
* | | | some linked id ui fine tuningVincent Breitmoser2015-03-265-27/+34
| | | |
* | | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-246-25/+18
| | | |
* | | | work on cookie scanning during creationVincent Breitmoser2015-03-2411-153/+150
| | | |
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-2484-1005/+1533
|\ \ \ \ | | |/ / | |/| | | | | | | | | | 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-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
| | |
| * | 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
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-193-60/+81
| |\ | | | | | | | | | development
| | * 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-1911-263/+323
| |/
| * Improve Passphrase class with finalize()Dominik Schürmann2015-03-191-6/+34
| |
| * Fix tests for Passphrase classDominik Schürmann2015-03-191-0/+4
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-192-17/+27
| |\ | | | | | | | | | development
| | * 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 18:16:02 +0000