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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \|	finish ui flow for yubikey import	Vincent Breitmoser	2015-03-22	9	-221/+396
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	actually promote to divert, pass yubikey's AID	Vincent Breitmoser	2015-03-22	6	-31/+24
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	improve status reporting in yubikey dialogue	Vincent Breitmoser	2015-03-22	3	-14/+114
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	move yubikey import into viewkeyfragment	Vincent Breitmoser	2015-03-22	9	-228/+376
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	split up wait/action yubikey fragments	Vincent Breitmoser	2015-03-21	20	-88/+264
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	work on ad-hoc yubikey import support	Vincent Breitmoser	2015-03-21	7	-37/+365
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	first steps toward yubikey activity	Vincent Breitmoser	2015-03-21	30	-468/+689
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
* \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel	Vincent Breitmoser	2015-03-21	27	-198/+215
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'manojkhannakm-development' into development	Dominik Schürmann	2015-03-21	26	-203/+184
\| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵	Dominik Schürmann	2015-03-21	26	-203/+184
\| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into manojkhannakm-development
\| \| * \| \| \| \| \| \| \| \| \|	Added docs for Notify class	Manoj Khanna	2015-03-20	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Fixed Snackbar behind keyboard on ImportKeysActivity	Manoj Khanna	2015-03-20	2	-9/+24
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Reworked Notify class	Manoj Khanna	2015-03-20	25	-197/+153
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add TODO to remote API	Dominik Schürmann	2015-03-21	1	-0/+2
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-03-20	1	-2/+17
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| \| * \ \ \ \ \ \ \ \ \	Merge pull request #1163 from kentnek/dev-list-footer	Dominik Schürmann	2015-03-20	1	-2/+17
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a blank footer view to the list of keys
\| \| \| * \| \| \| \| \| \| \| \| \|	- Added footer so that the Floating Action Button won't block the last few ↵	Kent	2015-03-20	1	-2/+17
\| \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	items' content
\| * \| / / / / / / / / /	Update api lib	Dominik Schürmann	2015-03-20	1	-0/+0
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Update OpenPGP API lib	Dominik Schürmann	2015-03-20	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix API RESULT_TYPE	Dominik Schürmann	2015-03-20	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix PASSPHRASE handling in API	Dominik Schürmann	2015-03-20	2	-2/+18
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	more data in RequiredInputParcel, OperationResult notifications	Vincent Breitmoser	2015-03-21	7	-36/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* \| \| \| \| \| \| \| \| \| \|	add edit key unit test for no-op	Vincent Breitmoser	2015-03-20	5	-0/+17
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix unit tests (for real)	Vincent Breitmoser	2015-03-20	7	-20/+39
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix more unit tests (syntax)	Vincent Breitmoser	2015-03-20	10	-66/+56
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	inline mNfcSignOps variable	Vincent Breitmoser	2015-03-20	1	-17/+16
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix unit tests (syntax)	Vincent Breitmoser	2015-03-20	4	-21/+33
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	re-inline cryptoInput variable	Vincent Breitmoser	2015-03-20	1	-32/+34
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/development' into development	Vincent Breitmoser	2015-03-20	86	-819/+1217
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #1164 from kentnek/dev-nfc-advanced-view	Dominik Schürmann	2015-03-20	9	-158/+275
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Implemented #1071: Invoke NFC in Advanced View
\| \| * \| \| \| \| \| \| \| \|	Updated GNU header	Kent	2015-03-20	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Removed create and added GPLv3 header	Kent	2015-03-20	1	-4/+17
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Implemented #1162: Invoke NFC in Advanced View	Kent	2015-03-20	9	-158/+261
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment. - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
\| * \| \| \| \| \| \| \| \|	Remove on click on icon	Dominik Schürmann	2015-03-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-03-19	3	-60/+81
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| \| * \ \ \ \ \ \ \ \	Merge pull request #1158 from manojkhannakm/development	Dominik Schürmann	2015-03-19	3	-60/+81
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed a crash on ViewKeyActivity and Issue #1114
\| \| \| * \| \| \| \| \| \| \| \|	Fix for Issue #1114	Manoj Khanna	2015-03-19	1	-5/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Displays the snackbar above the keyboard on all activities.
\| \| \| * \| \| \| \| \| \| \| \|	Fixed a crash on ViewKeyActivity	Manoj Khanna	2015-03-19	2	-55/+51
\| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This occurs when deleting a key with a stripped master key from the ViewKeyActivity.
\| * / / / / / / / / /	Manage my keys wizard	Dominik Schürmann	2015-03-19	35	-430/+455
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Improve Passphrase class with finalize()	Dominik Schürmann	2015-03-19	1	-6/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix header	Dominik Schürmann	2015-03-19	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix tests for Passphrase class	Dominik Schürmann	2015-03-19	10	-45/+71
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-03-19	2	-17/+27
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| \| * \ \ \ \ \ \ \ \	Merge pull request #1160 from jellysheep/cloudsearch-show-main-email	Dominik Schürmann	2015-03-18	1	-1/+14
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show HKP server results first in key cloud search. Fixes #1066
\| \| \| * \| \| \| \| \| \| \| \|	Added comments for server result sorting in key search	Max Mertens	2015-03-18	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Show HKP server results first in key cloud search. Fixes #1066	Max Mertens	2015-03-18	1	-1/+8
\| \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	New Passphrase class for safer passphrase handling in memory	Dominik Schürmann	2015-03-19	34	-140/+307
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	support yubikeys in (some) edit key operations	Vincent Breitmoser	2015-03-20	17	-248/+296
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	generalize NfcOperationParcel to RequiredInputParcel, including passphrases	Vincent Breitmoser	2015-03-19	12	-95/+147
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	yubikey certifications!	Vincent Breitmoser	2015-03-18	15	-240/+475
\| \| \| \| \| \| \| \| \| \| \|