Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wrapped-key-ring: move more helper methods into keys | Vincent Breitmoser | 2014-05-03 | 5 | -15/+153 |
| | |||||
* | wrapped-key-ring: move certification logic into secretkey | Vincent Breitmoser | 2014-05-03 | 7 | -125/+118 |
| | |||||
* | certification is always done with the master key | Vincent Breitmoser | 2014-05-03 | 2 | -56/+1 |
| | |||||
* | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 12 | -320/+744 |
| | | | | signencrypt | ||||
* | Merge pull request #601 from thi/rename-builder-methods | Dominik Schürmann | 2014-04-29 | 4 | -58/+58 |
|\ | | | | | Rename builder methods | ||||
| * | Rename setter methods for PgpDecryptVerify.Builder | Thialfihar | 2014-04-29 | 3 | -13/+13 |
| | | |||||
| * | Rename setter methods for PgpSignEncrypt.Builder | Thialfihar | 2014-04-29 | 3 | -45/+45 |
| | | |||||
* | | Merge pull request #600 from thi/rename-progressdialogupdater | Dominik Schürmann | 2014-04-29 | 8 | -54/+57 |
|\| | | | | | Rename progressdialogupdater | ||||
| * | Rename ProgressDialogUpdater to Progressable | Thialfihar | 2014-04-29 | 8 | -54/+57 |
| | | | | | | | | | | Also fix some inconsistent usages of "progress", now using "progressable" in all builders. | ||||
| * | Move util.ProgressDialogUpdater to pgp.Progressable | Thialfihar | 2014-04-29 | 1 | -0/+0 |
| | | |||||
* | | Formatting KeychainDatabase | Dominik Schürmann | 2014-04-29 | 1 | -17/+17 |
| | | |||||
* | | Clarify sqlite datatypes | Dominik Schürmann | 2014-04-29 | 1 | -2/+12 |
|/ | |||||
* | API: Fix GET_KEY, closes #599 | Dominik Schürmann | 2014-04-28 | 1 | -10/+13 |
| | |||||
* | Many API fixes for GET_KEY and GET_KEY_IDS | Dominik Schürmann | 2014-04-28 | 3 | -17/+25 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-22 | 5 | -16/+33 |
|\ | |||||
| * | Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003' | Vincent Breitmoser | 2014-04-22 | 1 | -1/+2 |
| |\ | |||||
| | * | fix nullpointer on missing s2k | Vincent Breitmoser | 2014-04-20 | 1 | -1/+2 |
| | | | | | | | | | | | | Fixes #590 | ||||
| * | | Merge commit '0b7fb70' | Vincent Breitmoser | 2014-04-22 | 4 | -15/+31 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | | split up filterSign and filterCertify in SelectSecretKeyFragment | Vincent Breitmoser | 2014-04-20 | 4 | -15/+31 |
| | | | | | | | | | | | | | | | | Closes #588 | ||||
* | | | | add has_secret for all who are upgrading from a beta version | Dominik Schürmann | 2014-04-22 | 1 | -3/+9 |
|/ / / | |||||
* | | | Workaround for nullpointer bug in support lib, close #591 | Dominik Schürmann | 2014-04-22 | 1 | -2/+3 |
| | | | |||||
* | | | Fix a nullptr in KeychainProvider | Vincent Breitmoser | 2014-04-20 | 1 | -1/+1 |
| |/ |/| | | | | | Fixes #589 | ||||
* | | More code cleanup | Dominik Schürmann | 2014-04-19 | 19 | -95/+116 |
|/ | |||||
* | Trying a fix for #585 | Dominik Schürmann | 2014-04-19 | 3 | -17/+21 |
| | |||||
* | Fix some smaller annoyances, closes #583, #582 | Dominik Schürmann | 2014-04-19 | 2 | -11/+5 |
| | |||||
* | Fix more strings | Dominik Schürmann | 2014-04-19 | 2 | -3/+3 |
| | |||||
* | fix unified query columns for select*fragment | Vincent Breitmoser | 2014-04-18 | 2 | -6/+5 |
| | |||||
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 8 | -10/+12 |
| | |||||
* | Do not show lookup button in decrypt activity for decryption-only | Dominik Schürmann | 2014-04-18 | 1 | -2/+4 |
| | |||||
* | FIx nfc button | Dominik Schürmann | 2014-04-18 | 2 | -7/+14 |
| | |||||
* | Fix upload of keys, closes #581 | Dominik Schürmann | 2014-04-18 | 2 | -3/+8 |
| | |||||
* | Remove kill hack in KeychainDatabase | Dominik Schürmann | 2014-04-17 | 1 | -9/+0 |
| | |||||
* | Remove dev hack in KeychainDatabase | Dominik Schürmann | 2014-04-17 | 1 | -5/+0 |
| | |||||
* | get rid of PgpKeyHelper.getMasterKeyId | Vincent Breitmoser | 2014-04-17 | 4 | -33/+21 |
| | | | | Closes #575 | ||||
* | NotFoundExceptions for all getGeneric-type methods | Vincent Breitmoser | 2014-04-17 | 7 | -121/+160 |
| | |||||
* | load data only once in ImportKeysListLoader | Vincent Breitmoser | 2014-04-17 | 1 | -3/+7 |
| | | | | Fixes #571 | ||||
* | add up navigation in ViewCertActivity | Vincent Breitmoser | 2014-04-17 | 2 | -0/+11 |
| | | | | Fixes #567 | ||||
* | use project icons for certification status | Vincent Breitmoser | 2014-04-17 | 2 | -6/+6 |
| | | | | Closes #573 | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-04-17 | 1 | -4/+12 |
|\ | |||||
| * | secret keys can only be deleted individually from multi selection | Vincent Breitmoser | 2014-04-17 | 1 | -4/+12 |
| | | |||||
* | | Rename provider types following ↵ | Dominik Schürmann | 2014-04-17 | 1 | -12/+35 |
|/ | | | | http://developer.android.com/guide/topics/providers/content-provider-creating.html | ||||
* | Use git submodules for libs, fix compilation, remove library sourcecode | Dominik Schürmann | 2014-04-16 | 2 | -8/+4 |
| | |||||
* | Merge pull request #576 from Valodim/stripped-secretkeys | Dominik Schürmann | 2014-04-16 | 10 | -30/+108 |
|\ | | | | | Support stripped secretkeys | ||||
| * | Fix even more whitespace | Vincent | 2014-04-16 | 1 | -1/+1 |
| | | |||||
| * | Fix more whitespace | Vincent | 2014-04-16 | 1 | -2/+2 |
| | | |||||
| * | Fix whitespace | Vincent | 2014-04-16 | 1 | -1/+1 |
| | | |||||
| * | stripped support: implement has_secret support, in ui and impot of secret keys | Vincent Breitmoser | 2014-04-16 | 5 | -12/+79 |
| | | | | | | | | Closes #570 | ||||
| * | stripped support: add has_secret column to keys table | Vincent Breitmoser | 2014-04-16 | 8 | -18/+29 |
| | | |||||
* | | Translations from transifex, fix some strings references | Dominik Schürmann | 2014-04-16 | 3 | -4/+4 |
|/ | |||||
* | Clarify comments | Dominik Schürmann | 2014-04-16 | 1 | -2/+2 |
| |