connectbot-yubikey/open-keychain - open-keychain with patches to support ssh authentication

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/master' into db-overhaul	Vincent Breitmoser	2014-04-03	1	-5/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Trivial spacing changes to conform to style guide	Thialfihar	2014-04-02	1	-5/+5
\| \|
\| *	Cleanup	Dominik Schürmann	2014-04-01	1	-5/+0
\| \|
\| *	Automatically select newly created key in api accounts	Dominik Schürmann	2014-04-01	1	-16/+11
\| \|
* \|	Break a lot of stuff. Also, database redesign.	Vincent Breitmoser	2014-04-03	1	-6/+9
\|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change entire database design. This introduces a lot of changes, notably all URIs and almost all projections. Some features (like key deletion) have been simply commented out for now since they need serious reconsideration. There are a couple of new TODOs marking places where more work is needed. The migration path works fine from what I tested. The old database is not deleted for now, ie, it is reimported at every start of the application making all intermediate changes transient. Tested and working (for me): - All activities in the main drawer - Multiselect and Search - ViewKeyActivity, with and without secret key available - CertifyKeyActivity - SelectSecretKeyActivity (from CertifyKeyActivity) - SelectPublicKeyActivity (from encrypt activity) What doesn't work: - Actually certifying keys (pending a TODO in ProviderHelper) - Importing keys doesn't preserve secret keys - "Encrypt to this contact" doesn't pass key - Editing keys. All controls are disabled, I'm not sure why... (is this even my fault?) - Deleting keys What I didn't test: - Key export - API stuff - Creating keys (since editing doesn't even work)
*	reformat merge	Dominik Schürmann	2014-03-21	1	-3/+5
\|
*	Update fix for #451	Nikhil Peter Raj	2014-03-21	1	-3/+2
\|
*	Cleanup for #451	Nikhil Peter Raj	2014-03-20	1	-1/+0
\|
*	Fix for #451	Nikhil Peter Raj	2014-03-20	1	-68/+96
\|
*	add apg's fix for Key id display	uberspot	2014-03-19	1	-1/+1
\|
*	CertifyKeyActivity sets error if no key is selected	uberspot	2014-03-18	1	-2/+2
\|
*	certify: selectsecretkeyfragment cosmetics	Vincent Breitmoser	2014-03-15	1	-3/+10
\|
*	More code style fixes for /ui	uberspot	2014-03-13	1	-1/+4
\|
*	First code style changes in ui	uberspot	2014-03-13	1	-11/+6
\|
*	cleanup	Dominik Schürmann	2014-03-11	1	-42/+36
\|
*	Added string reference for Issue #207	Sreeram Boyapati	2014-03-10	1	-4/+4
\|
*	Fix to passphrase dialog and Issue #207	Sreeram Boyapati	2014-03-10	1	-6/+44
\|
*	fix select key-signing keys	Ashley Hughes	2014-02-02	1	-0/+7
\|
*	language fix	Dominik Schürmann	2014-01-29	1	-1/+1
\|
*	New Gradle project structure	Dominik Schürmann	2014-01-27	1	-0/+139