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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \|	Pull from transifex	Dominik Schürmann	2015-03-23	3	-10/+10
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #1165 from kentnek/dev-yubikey-null	Dominik Schürmann	2015-03-23	1	-5/+11
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed #1152: NullPointerException when signing with YubiKey
\| \| * \| \| \| \| \| \| \| \| \|	Fixed #1152:	Kent	2015-03-20	1	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Checking if input.getSignatureSubKeyId() is not null before proceeding.
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #1166 from adithyaphilip/multi-threaded	Dominik Schürmann	2015-03-23	22	-122/+681
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multi-threaded key import, update all feature
\| \| * \| \| \| \| \| \| \| \| \| \|	shifted multi-threading to own service	Adithya Abraham Philip	2015-03-23	20	-334/+608
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
\| \| * \| \| \| \| \| \| \| \| \| \|	introduced multi-threading	Adithya Abraham Philip	2015-03-23	4	-35/+320
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix passphrase cache not clearing all passphrases	Dominik Schürmann	2015-03-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1174 from Jesperbk/development	Dominik Schürmann	2015-03-23	1	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Fixed symmetric encryption crash
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixed issue where setting a passphrase to null later causes a ↵	JesperBK	2015-03-23	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NullPointerException.
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'development' of github.com:open-keychain/open-keychain into ↵	Dominik Schürmann	2015-03-23	1	-14/+23
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	development
\| * \| \| \| \| \| \| \| \| \| \| \|	Use markdown for in-app help	Dominik Schürmann	2015-03-23	3	-17/+41
\| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	further improve yubikey error handling	Vincent Breitmoser	2015-03-23	4	-24/+77
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	nicer handling of nfc errors	Vincent Breitmoser	2015-03-23	1	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'development' into v/crypto-input-parcel	Vincent Breitmoser	2015-03-22	1	-14/+23
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	use top line in snackbar for status indication	Vincent Breitmoser	2015-03-22	1	-14/+23
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	fix unit test and add new for divert-to-card promotion	Vincent Breitmoser	2015-03-22	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	enable nfc in import dialog as well	Vincent Breitmoser	2015-03-22	3	-5/+49
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	finish ui flow for yubikey import	Vincent Breitmoser	2015-03-22	7	-198/+330
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	actually promote to divert, pass yubikey's AID	Vincent Breitmoser	2015-03-22	5	-30/+21
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	improve status reporting in yubikey dialogue	Vincent Breitmoser	2015-03-22	1	-11/+102
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	move yubikey import into viewkeyfragment	Vincent Breitmoser	2015-03-22	6	-158/+259
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	split up wait/action yubikey fragments	Vincent Breitmoser	2015-03-21	6	-67/+142
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	work on ad-hoc yubikey import support	Vincent Breitmoser	2015-03-21	5	-21/+278
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	first steps toward yubikey activity	Vincent Breitmoser	2015-03-21	28	-451/+589
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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	25	-193/+200
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵	Dominik Schürmann	2015-03-21	24	-198/+169
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Reworked Notify class	Manoj Khanna	2015-03-20	24	-197/+153
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add TODO to remote API	Dominik Schürmann	2015-03-21	1	-0/+2
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	Fix API RESULT_TYPE	Dominik Schürmann	2015-03-20	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix PASSPHRASE handling in API	Dominik Schürmann	2015-03-20	1	-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	3	-0/+10
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix unit tests (for real)	Vincent Breitmoser	2015-03-20	4	-5/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix more unit tests (syntax)	Vincent Breitmoser	2015-03-20	6	-17/+17
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	inline mNfcSignOps variable	Vincent Breitmoser	2015-03-20	1	-17/+16
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fix unit tests (syntax)	Vincent Breitmoser	2015-03-20	3	-3/+13
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	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	47	-603/+996
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \| \| \| \| \| \|	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	3	-154/+240
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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
\| \| * \| \| \| \| \| \| \| \|	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	11	-263/+323
\| \|/ / / / / / / / /