| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 42 | -170/+445 | |
| | |\ \ | |/ / |/| | | ||||||
| * | | | title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Callback for OpenPgpServiceConnection | Dominik Schürmann | 2014-04-03 | 1 | -0/+33 | |
| | | | | ||||||
| * | | | simplify OpenPgpServiceConnection | Dominik Schürmann | 2014-04-03 | 1 | -5/+2 | |
| | | | | ||||||
| * | | | Keychain API Demo 3 | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ↵ | Dominik Schürmann | 2014-04-03 | 26 | -1407/+635 | |
| |\ \ \ | | | | | | | | | | | | | Valodim-db-overhaul | |||||
| * | | | | Disable tests | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | version 2.5 | Dominik Schürmann | 2014-04-03 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Update from transifex | Dominik Schürmann | 2014-04-03 | 25 | -1/+221 | |
| | | | | | ||||||
| * | | | | Changelog | Dominik Schürmann | 2014-04-03 | 3 | -2/+8 | |
| | | | | | ||||||
| * | | | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 2 | -6/+8 | |
| | | | | | ||||||
| * | | | | Key lookup for API | Dominik Schürmann | 2014-04-03 | 2 | -7/+16 | |
| | | | | | ||||||
| * | | | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 10 | -147/+155 | |
| | | | | | ||||||
| | | * | | db-overhaul: different hack for type info (api level problem inside) | Vincent Breitmoser | 2014-04-04 | 1 | -18/+6 | |
| | | | | | ||||||
| | | * | | calculate nfc packet on demand only | Vincent Breitmoser | 2014-04-04 | 1 | -20/+18 | |
| | | | | | ||||||
| | | * | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity | Vincent Breitmoser | 2014-04-04 | 7 | -10/+25 | |
| | | | | | ||||||
| | | * | | db-overhaul: reintroduce by-mail and by-subkey queries | Vincent Breitmoser | 2014-04-04 | 5 | -78/+109 | |
| | | | | | | | | | | | | | | | | | | | | | the only thing left to fix after the db upgrade (that I can think of right now) are key exports | |||||
| | | * | | db-overhaul: minor stuff, mostly ProviderHelper | Vincent Breitmoser | 2014-04-04 | 8 | -78/+73 | |
| | | | | | ||||||
| | | * | | db-overhaul: more work on new provider | Vincent Breitmoser | 2014-04-03 | 10 | -263/+208 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specifics: - secret keys are preserved when a new public key is inserted - started work to give virtual columns a representation in the contract class - streamline ProviderHelper methods. the getUnifiedData method relies on a api level 11 method, not sure yet how to fix/workaround that... - many more small things work as they did before | |||||
| | | * | | more work on streamlining uris, and stripping ProviderHelper | Vincent Breitmoser | 2014-04-03 | 10 | -223/+148 | |
| | | | | | ||||||
| | | * | | ditch useless PgpKeyHelper.getMasterKey methods | Vincent Breitmoser | 2014-04-03 | 7 | -100/+23 | |
| | |/ / | ||||||
| | * | | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-03 | 113 | -1011/+1322 | |
| | |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| * | | | Cleanup DrawerActivity | Dominik Schürmann | 2014-04-03 | 1 | -31/+4 | |
| | | | | ||||||
| * | | | clarify readme | Dominik Schürmann | 2014-04-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #508 from thi/naming-adjustments | Dominik Schürmann | 2014-04-02 | 15 | -106/+106 | |
| |\ \ \ | | | | | | | | | Naming adjustments | |||||
| | * | | | Rename "canEdit" to "canBeEdited" | Thialfihar | 2014-04-02 | 4 | -13/+13 | |
| | | | | | ||||||
| | * | | | Rename "armour" to "armor" | Thialfihar | 2014-04-02 | 6 | -20/+20 | |
| | | | | | ||||||
| | * | | | Rename "pass phrase" to "passphrase" | Thialfihar | 2014-04-02 | 10 | -73/+73 | |
| |/ / / | ||||||
| * | | | Cleanup example code | Dominik Schürmann | 2014-04-02 | 1 | -7/+7 | |
| | | | | ||||||
| * | | | Started changelog for 2.5 | Dominik Schürmann | 2014-04-02 | 1 | -0/+8 | |
| | | | | ||||||
| * | | | Fix build | Dominik Schürmann | 2014-04-02 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge pull request #507 from thi/fix-wildcard-imports | Dominik Schürmann | 2014-04-02 | 15 | -25/+135 | |
| |\ \ \ | | | | | | | | | Fix wildcard imports | |||||
| | * | | | Add wildcard import warning to checkstyle configuration | Thialfihar | 2014-04-02 | 1 | -1/+7 | |
| | | | | | ||||||
| | * | | | Replace wildcard imports with explicit imports | Thialfihar | 2014-04-02 | 13 | -21/+126 | |
| | | | | | ||||||
| | * | | | Spacing corrections | Thialfihar | 2014-04-02 | 1 | -3/+2 | |
| |/ / / | ||||||
| * | | | Update from transifex | Dominik Schürmann | 2014-04-02 | 32 | -270/+217 | |
| | | | | ||||||
| * | | | Merge pull request #502 from thi/conform-to-style-guide | Dominik Schürmann | 2014-04-02 | 68 | -464/+538 | |
| |\ \ \ | | | | | | | | | Conform to style guide, #466 | |||||
| | * | | | Suppress checkstyle for some files | Thialfihar | 2014-04-02 | 2 | -2/+14 | |
| | | | | | ||||||
| | * | | | Add missing and curly brackets and fix others | Thialfihar | 2014-04-02 | 7 | -60/+61 | |
| | | | | | | | | | | | | | | | | | | | | | Style guide demands them even for single-line blocks, and opening curly brackets never appear on a line on their own. | |||||
| | * | | | Rearrange too long lines | Thialfihar | 2014-04-02 | 28 | -145/+228 | |
| | | | | | ||||||
| | * | | | Adjust variable/member naming to conform to style guide | Thialfihar | 2014-04-02 | 11 | -79/+82 | |
| | | | | | | | | | | | | | | | | | | | | | In some cases change member accessibility, so the naming matches. Also, some key words were reordered to comply with JLS suggestions. | |||||
| | * | | | Trivial spacing changes to conform to style guide | Thialfihar | 2014-04-02 | 29 | -85/+87 | |
| | | | | | ||||||
| | * | | | Adjust copyright headers | Thialfihar | 2014-04-02 | 6 | -12/+20 | |
| | | | | | ||||||
| | * | | | Adjust import order | Thialfihar | 2014-04-02 | 24 | -81/+46 | |
| |/ / / | ||||||
| * | | | always ask | Ashley Hughes | 2014-04-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | confirm that empty IDs are really wanted | Ashley Hughes | 2014-04-02 | 2 | -1/+47 | |
| | | | | ||||||
| * | | | new ID sigs already added, so do save them | Ashley Hughes | 2014-04-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | allow blank IDs, allow adding new IDs and let them be master | Ashley Hughes | 2014-04-02 | 2 | -5/+8 | |
| | | | | ||||||
| * | | | pass through info that keys are new without relying on new keys orginally ↵ | Ashley Hughes | 2014-04-01 | 5 | -2/+22 | |
| | | | | | | | | | | | | | being empty | |||||
| * | | | sort out saving empty string IDs | Ashley Hughes | 2014-04-01 | 1 | -9/+3 | |
| | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |