aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-102-10/+11
|\
| * Merge pull request #545 from danielhass/toast_replacementDominik Schürmann2014-04-102-10/+11
| |\ | | | | | | Toast replacement
| | * Deleted wrong AppMsgDaniel Haß2014-04-101-3/+0
| | |
| | * Replaced Toasts in ViewKeyActivityDaniel Haß2014-04-091-7/+11
| | |
| | * Removed unused Toast import in ViewKeyActivityJBDaniel Haß2014-04-091-1/+0
| | |
| | * Replaced Toasts in ImportKeysOrCodeFragmentDaniel Haß2014-04-091-3/+3
| | |
* | | Integrate NFC functionality into ViewKeyActivityDominik Schürmann2014-04-104-157/+111
|/ /
* | Prettify more layouts, fix edit and encrypt intents from key viewDominik Schürmann2014-04-093-12/+29
| |
* | Temporary disable of master key id extraction from uriDominik Schürmann2014-04-091-7/+7
| |
* | Prettify some layoutsDominik Schürmann2014-04-092-1/+2
| |
* | certs: fix verification in ViewKeyActivity (how embarassing)Vincent Breitmoser2014-04-091-2/+2
| | | | | | | | Fixes #541
* | Fix NFCDominik Schürmann2014-04-092-45/+50
| |
* | Fix save keyring, improve signature verificationDominik Schürmann2014-04-096-101/+108
|/
* Cleanup in SelectKeyCursorAdapterDominik Schürmann2014-04-092-9/+3
|
* Hide keyboard after hiding custom key length fieldDominik Schürmann2014-04-091-1/+9
|
* Merge pull request #539 from gogowitczak/custom-key-length-infoDominik Schürmann2014-04-091-37/+84
|\ | | | | Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions.
| * Modified Spinner values for CreateKeyDialog. Added info for user about ↵gogowitczak2014-04-081-37/+84
| | | | | | | | custom key length restrictions.
* | KeychainIntentService instead of APGDominik Schürmann2014-04-091-1/+1
| |
* | Fix DECRYPT and SEND intentDominik Schürmann2014-04-091-1/+1
| |
* | Use NotFoundException in more placesDominik Schürmann2014-04-0812-85/+141
| |
* | Fix decryption of messages/files encrypted for multiple public keysDominik Schürmann2014-04-081-31/+56
| |
* | Introduce ProviderHelper.NotFoundException, remove dead codeDominik Schürmann2014-04-0812-128/+152
|/
* Change license from ASLv2 to GPLv3 where possibleThialfihar2014-04-0835-315/+350
|
* Update copyright timespan for ThialfiharThialfihar2014-04-0833-36/+36
|
* Merge pull request #536 from gogowitczak/custom-key-lengthDominik Schürmann2014-04-081-22/+129
|\ | | | | Added possibility to enter custom key length.
| * Fixed coding style.gogowitczak2014-04-081-3/+6
| |
| * Added possibility to enter custom key length. Added key length limitations, ↵gogowitczak2014-04-071-22/+126
| | | | | | | | according to issue #102 and SpongyCastle specification.
* | Futher Toast replacements in CertifyKeyActivityDaniel Haß2014-04-071-8/+9
|/
* show key expiry status similar to revocationVincent Breitmoser2014-04-063-13/+13
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-06133-0/+26804