aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Minimize use of class variables in ViewKeyDominik Schürmann2014-04-101-6/+6
|
* Cleanup AsyncTask code for NFCDominik Schürmann2014-04-101-6/+8
|
* Cleanup importsDominik Schürmann2014-04-101-2/+0
|
* 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-096-19/+35
| |
* | Temporary disable of master key id extraction from uriDominik Schürmann2014-04-091-7/+7
| |
* | Prettify some layoutsDominik Schürmann2014-04-096-48/+45
| |
* | certs: fix verification in ViewKeyActivity (how embarassing)Vincent Breitmoser2014-04-091-2/+2
| | | | | | | | Fixes #541
* | Fix gitignore for lintDominik Schürmann2014-04-092-6/+5
| |
* | Fix certification layoutDominik Schürmann2014-04-091-29/+21
| |
* | 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-094-41/+111
|\ | | | | 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-084-41/+111
| | | | | | | | 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
|/
* Merge pull request #537 from thi/change-license-to-gplDominik Schürmann2014-04-0845-444/+480
|\ | | | | Change license to gpl
| * Change license from ASLv2 to GPLv3 where possibleThialfihar2014-04-0843-403/+439
| |
| * Update copyright timespan for ThialfiharThialfihar2014-04-0841-49/+49
|/
* Merge pull request #536 from gogowitczak/custom-key-lengthDominik Schürmann2014-04-084-22/+152
|\ | | | | 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-074-22/+149
| | | | | | | | according to issue #102 and SpongyCastle specification.
* | Merge pull request #531 from danielhass/toast_replacementDominik Schürmann2014-04-071-8/+9
|\ \ | |/ |/| Futher Toast replacements
| * Futher Toast replacements in CertifyKeyActivityDaniel Haß2014-04-071-8/+9
|/
* Merge pull request #529 from gogowitczak/gradlebug-branchDominik Schürmann2014-04-061-13/+13
|\ | | | | Fixed gradle localTest bug on Windows.
| * Fixed gradle localTest bug on Windows.gogowitczak2014-04-061-13/+13
|/
* Comment out localTest due to bug on windowsDominik Schürmann2014-04-061-13/+13
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-063-13/+13
|\
| * Merge pull request #522 from Valodim/masterDominik Schürmann2014-04-063-13/+13
| |\ | | | | | | show key expiry status similar to revocation
| | * show key expiry status similar to revocationVincent Breitmoser2014-04-063-13/+13
| |/
* / License clarification in READMEDominik Schürmann2014-04-061-2/+3
|/
* Update READMEDominik Schürmann2014-04-061-1/+1
|
* Update travis linkDominik Schürmann2014-04-061-1/+1
|
* Update transifex configDominik Schürmann2014-04-061-18/+18
|
* Update READMEDominik Schürmann2014-04-061-10/+10
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-06532-7/+7
|
* Pull from transifexDominik Schürmann2014-04-0638-106/+124
|
* Optimize comments, remove dead codeDominik Schürmann2014-04-066-47/+5
|
* Use dark icon in warning dialogs in edit keyDominik Schürmann2014-04-061-2/+2
|