Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | import: use wrapped keyring instead of uncached keyring for trust | Vincent Breitmoser | 2014-06-12 | 1 | -1/+1 |
| | |||||
* | import-log: minor improvements | Vincent Breitmoser | 2014-06-12 | 1 | -1/+3 |
| | |||||
* | canonicalize: more stuff | Vincent Breitmoser | 2014-06-12 | 1 | -7/+10 |
| | |||||
* | canonicalize: implementation, first draft | Vincent Breitmoser | 2014-06-12 | 1 | -1/+20 |
| | |||||
* | import-log: better way to check self trust, and fix log level filtering | Vincent Breitmoser | 2014-06-12 | 1 | -1/+0 |
| | |||||
* | import-log: work on log fragment ui | Vincent Breitmoser | 2014-06-10 | 1 | -2/+2 |
| | |||||
* | import-log: switch to flags instead of statuses for result int | Vincent Breitmoser | 2014-06-10 | 1 | -20/+22 |
| | |||||
* | import-log: more interface work | Vincent Breitmoser | 2014-06-10 | 1 | -10/+23 |
| | |||||
* | import-log: some cosmetics | Vincent Breitmoser | 2014-06-10 | 1 | -23/+26 |
| | |||||
* | import-log: add OperationResults, use it in ImportKeys operation | Vincent Breitmoser | 2014-06-10 | 1 | -3/+9 |
| | |||||
* | import-log: better stripped key logging | Vincent Breitmoser | 2014-06-06 | 1 | -1/+2 |
| | |||||
* | import-log: add import log string resources | Vincent Breitmoser | 2014-06-06 | 1 | -0/+38 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into edit-key-rewrite | Vincent Breitmoser | 2014-06-02 | 1 | -3/+3 |
|\ | |||||
| * | Add Log.d for QueryFailedException | Tim Bray | 2014-05-23 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into wrapped-key-ring | Vincent Breitmoser | 2014-05-14 | 1 | -24/+42 |
|\| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Add applications section to help | Dominik Schürmann | 2014-05-07 | 1 | -1/+1 |
| | | |||||
| * | Start app menu item for registered apps | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| | | |||||
| * | Design fixes for certification activity | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| | | |||||
| * | Use paste icon, clarify language once again | Dominik Schürmann | 2014-05-07 | 1 | -3/+4 |
| | | |||||
| * | Clarify language | Dominik Schürmann | 2014-05-07 | 1 | -2/+3 |
| | | |||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-05-07 | 1 | -0/+1 |
| |\ | |||||
| | * | display AppMsg warning when no encryption subkey is available | Vincent Breitmoser | 2014-05-07 | 1 | -0/+1 |
| | | | |||||
| * | | Clarify language | Dominik Schürmann | 2014-05-07 | 1 | -4/+4 |
| |/ | |||||
| * | Clarify language | Dominik Schürmann | 2014-05-06 | 1 | -8/+8 |
| | | |||||
| * | Some small style fixes | Dominik Schürmann | 2014-05-06 | 1 | -2/+2 |
| | | |||||
| * | ui: use textviews instead of bootstrap buttons in SignEncrypt | Vincent Breitmoser | 2014-05-06 | 1 | -0/+1 |
| | | |||||
| * | ui: remove primary subkey info | Vincent Breitmoser | 2014-05-05 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #603 from timbray/master | Dominik Schürmann | 2014-05-05 | 1 | -0/+3 |
| |\ | | | | | | | Adds first level of keybase support | ||||
| | * | can search openkeychain, retrieve & install & use keys from there | Tim Bray | 2014-04-29 | 1 | -0/+3 |
| | | | |||||
| * | | Update from transifex | Dominik Schürmann | 2014-05-05 | 1 | -1/+2 |
| | | | |||||
| * | | New key view design, using Android flat buttons and Android icons | Dominik Schürmann | 2014-05-05 | 1 | -14/+22 |
| |/ | |||||
* / | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -0/+1 |
|/ | | | | KeychainIntentService! | ||||
* | Merge commit '0b7fb70' | Vincent Breitmoser | 2014-04-22 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | split up filterSign and filterCertify in SelectSecretKeyFragment | Vincent Breitmoser | 2014-04-20 | 1 | -0/+1 |
| | | | | | | | | Closes #588 | ||||
* | | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -10/+13 |
|/ | |||||
* | better error string for too many responses | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 |
| | |||||
* | Trying a fix for #585 | Dominik Schürmann | 2014-04-19 | 1 | -1/+1 |
| | |||||
* | Fix more strings | Dominik Schürmann | 2014-04-19 | 1 | -6/+6 |
| | |||||
* | certify keys | Dominik Schürmann | 2014-04-19 | 1 | -2/+2 |
| | |||||
* | Remove unused strings, fix some lint errors, fix some language confusions | Dominik Schürmann | 2014-04-18 | 1 | -54/+11 |
| | |||||
* | add up navigation in ViewCertActivity | Vincent Breitmoser | 2014-04-17 | 1 | -0/+1 |
| | | | | Fixes #567 | ||||
* | secret keys can only be deleted individually from multi selection | Vincent Breitmoser | 2014-04-17 | 1 | -1/+2 |
| | |||||
* | stripped support: implement has_secret support, in ui and impot of secret keys | Vincent Breitmoser | 2014-04-16 | 1 | -0/+2 |
| | | | | Closes #570 | ||||
* | Improve verification result display, close #568 | Dominik Schürmann | 2014-04-15 | 1 | -8/+16 |
| | |||||
* | key edit: fix crash when create date was after expiry date, change from ↵ | Dominik Schürmann | 2014-04-14 | 1 | -3/+4 |
| | | | | gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity | ||||
* | Simplify and fix delete key dialog | Dominik Schürmann | 2014-04-11 | 1 | -3/+2 |
| | |||||
* | get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString | Vincent Breitmoser | 2014-04-11 | 1 | -0/+2 |
| | |||||
* | Select*KeyFragment rewrites | Vincent Breitmoser | 2014-04-10 | 1 | -0/+2 |
| | | | | | | | | | | - moved all specific Public/Secret logic from the Adapter class into inner subclasses in the Fragments - more versatile status display ("revoked", "expired", "can certify"...) - applied view holder pattern - query logic, including subqueries, moved into provider classes Closes #375 | ||||
* | ViewCertActivity cleanup | Vincent Breitmoser | 2014-04-10 | 1 | -0/+8 |
| | | | | Closes #547 | ||||
* | Modified Spinner values for CreateKeyDialog. Added info for user about ↵ | gogowitczak | 2014-04-08 | 1 | -1/+6 |
| | | | | custom key length restrictions. |