cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,593 Commits 1 Branch 0 Tags
587e7d088b3f3d2d57231a91e2e5c2c0c0f97983
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 587e7d088b use QueueingCryptoOperationFragment in all other places 2015-07-07 23:57:12 +02:00
Vincent Breitmoser 310228f6ba introduce QueueingCryptoOperationFragment to queue result handling in detached state 2015-07-07 23:43:23 +02:00
Vincent Breitmoser 895d1fbef6 try cache in certify operation (fixes #1242) 2015-07-07 23:41:44 +02:00
Vincent Breitmoser 65362beaf9 move queued action handling from prev commit into onActivityCreated 2015-07-07 22:23:08 +02:00
Vincent Breitmoser c8107bd4ed handle getActivity() by queueing results in CreateKeyFinalFragment 2015-07-07 21:52:17 +02:00
Vincent Breitmoser a91fc1c0c9 fix passphrase->deletion ui flow for secret keys, and disregard cache 2015-07-07 19:55:27 +02:00
Vincent Breitmoser b1f5290dfa fix some nullpointers from proxy implementation 2015-07-07 17:45:27 +02:00
Vincent Breitmoser 64cec07b16 fix handling of progress dialog creation in CryptoOperationFragment (fixes #1407) 2015-07-07 17:16:12 +02:00
Vincent Breitmoser a320affe86 tests: make sure encryption happens to all enc-capable subkeys 2015-07-07 17:16:11 +02:00
Vincent Breitmoser 148867ae86 actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366) 2015-07-06 17:19:08 +02:00
Vincent Breitmoser e9e9cf2374 also catch DecoderException in decryptverify 2015-07-06 16:37:47 +02:00
Vincent Breitmoser 8b439be1f5 don't cache exporthelper, keep type for KeyItem in KeySpinner 2015-07-06 16:24:26 +02:00
Vincent Breitmoser 7648602fc8 encrypt to all encryption subkeys, rather than just the first 2015-07-06 02:18:34 +02:00
Vincent Breitmoser f1a75a81e7 catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown from BouncyCastle 2015-07-06 02:02:52 +02:00
Vincent Breitmoser 922d4c6a96 fix PromoteKeyOperationTest 2015-07-06 01:20:55 +02:00
Vincent Breitmoser e70d06603a forgot a couple lines to commit 2015-07-06 00:59:28 +02:00
Vincent Breitmoser 42cd103355 nicer error msg if input data cannot be read 2015-07-06 00:55:34 +02:00
Vincent Breitmoser 17defe556a cleanup, NonNull annotation, never return null in PgpDecryptVerify 2015-07-06 00:52:53 +02:00
Vincent Breitmoser 539379a629 some cleanup and documentation 2015-07-06 00:10:54 +02:00
Vincent Breitmoser 7e83900d6c make sure clipboard service retrieval is always null-proof 2015-07-05 21:49:02 +02:00
Vincent Breitmoser bd78166c66 don't show notification in MainActivity when state is restored 2015-07-05 21:21:34 +02:00
Vincent Breitmoser 4d8be637de better getActivity and getSystemService null handling in encryptfilesfragment 2015-07-05 21:20:57 +02:00
Vincent Breitmoser f306722276 set data for query intent (fix #1389) 2015-07-05 20:37:21 +02:00
Vincent Breitmoser f29d8351ba instrument: add filesize check to text encryption test 2015-06-30 17:10:50 +02:00
Vincent Breitmoser 4407973110 small layout fix in EncryptTextFragment 2015-06-30 16:40:00 +02:00
Vincent Breitmoser d26379da3a make timeout method in PassphraseCacheService more robust against nullpointers 2015-06-30 16:31:02 +02:00
Vincent Breitmoser 473866baaf instrument: add test for empty clipboard, fix empty clipboard error 2015-06-30 15:37:02 +02:00
Vincent Breitmoser f1c0c3e00c earlier error on empty clipboard 2015-06-30 15:15:03 +02:00
Vincent Breitmoser 27441c7d63 fail more gracefully on empty clipboard in DecryptActivity 2015-06-30 15:13:28 +02:00
Vincent Breitmoser 853964670b instrument: add tests for adv key share fragment 2015-06-29 14:59:48 +02:00
Vincent Breitmoser c43e29b621 cleanup share fragment, fix sharing of fingerprint 2015-06-29 14:59:48 +02:00
Vincent c3d5160f17 Merge pull request #1324 from open-keychain/v/multi-decrypt 
finished encrypt/decrypt rewrite
 2015-06-26 16:41:17 +02:00
Vincent Breitmoser bda15ff92d instrument: small fix and up to date coverage.ec 2015-06-26 16:31:14 +02:00
Vincent Breitmoser 0077891f1d Merge branch 'master' into v/multi-decrypt 2015-06-26 15:40:38 +02:00
Vincent Breitmoser 56ef0f320b disable automatic accept for own uid in RemoteService, and fix some warnings 2015-06-26 15:40:12 +02:00
Vincent Breitmoser 4f23161d93 instrument: stash away bitmapmatcher for later 2015-06-26 13:05:52 +02:00
Vincent Breitmoser dce4503ac5 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-26 02:44:59 +02:00
Vincent Breitmoser 51d35c7a83 instrument: first couple of tests for OpenPGP API 2015-06-26 01:59:11 +02:00
Vincent Breitmoser 88c86e1945 use KeyAdapter for AllowedKeysListFragment 2015-06-26 01:59:11 +02:00
Vincent Breitmoser 3af5ba0343 fix warnings in PassphraseCacheService 2015-06-26 01:59:11 +02:00
Vincent Breitmoser a990044fd9 fix: save file 2015-06-23 23:13:19 +02:00
Vincent Breitmoser ed82f0de9e instrument: save file 2015-06-23 23:13:11 +02:00
Vincent Breitmoser 8d141176bd fix original file deletion (and instrumentation) 2015-06-23 21:56:27 +02:00
Vincent Breitmoser 45a8510bf0 instrument: delete file and inline preference tests 2015-06-23 21:17:28 +02:00
Vincent Breitmoser f9dea31300 implement deletion of files 2015-06-23 17:07:59 +02:00
Vincent Breitmoser 6a5bd6509b implement saving of files 2015-06-23 16:58:40 +02:00
Vincent Breitmoser 558cc6befc instrument: adapt to new decrypt file dialog, and some minor fixes 2015-06-23 00:09:18 +02:00
Vincent Breitmoser 4826e0a8c8 move select file logic into EncryptDecryptOverviewFragment 2015-06-22 23:48:41 +02:00
Vincent Breitmoser 8d1dc940c4 small fix and some cleanup in ServiceProgressFragment 2015-06-22 23:08:03 +02:00
Vincent Breitmoser 1590d8f538 instrument: some cleanup 2015-06-22 23:07:38 +02:00
Vincent Breitmoser aee2ca7b9a update instrumentation coverage file 2015-06-22 17:32:32 +02:00
Vincent Breitmoser 8307a5bffc instrument: test error handling in asymmetric operations 2015-06-22 15:45:08 +02:00
Vincent Breitmoser 5f91c57b4a don't expose dataset for FileAdapter in encrypt view, small improvements to error handling 2015-06-22 15:44:15 +02:00
Vincent Breitmoser 97d45a0faa order menu items for encrypt operations 2015-06-22 14:32:15 +02:00
Vincent Breitmoser b2dec85421 multi-decrypt: use indeterminate progress only 2015-06-22 14:27:18 +02:00
Vincent Breitmoser 2e8fb9cbdd instrument: restructure some tests, add bad clipboard data test 2015-06-22 13:44:14 +02:00
Vincent Breitmoser 804a58e779 instrument: some updates to asymmetric decrypt tests 2015-06-22 03:16:32 +02:00
Vincent Breitmoser 361ad99928 add failure state to DecryptListFragment 2015-06-22 03:13:55 +02:00
Vincent Breitmoser fe7d13c85f add extra for initial fragment in MainActivity 2015-06-22 03:11:46 +02:00
Vincent Breitmoser 2786869e1b update keychain intents submodule (for travis) 2015-06-20 23:40:42 +02:00
Vincent Breitmoser b7c1a18354 update instrumentation coverage file 2015-06-20 23:32:28 +02:00
Vincent Breitmoser 2a05e2a17b instrument: fix DrawableMatcher for varying contexts 2015-06-20 22:32:55 +02:00
Vincent Breitmoser 675df57abd don't show "delete original file" for non-file input uris 2015-06-20 22:29:18 +02:00
Vincent Breitmoser 2e8ae577b5 instrument: check for encrypt/sign status icons 2015-06-20 22:29:03 +02:00
Vincent Breitmoser 0be790dcad fix display of signed-only content 2015-06-20 21:34:21 +02:00
Vincent Breitmoser 752204d3cc instrument: update asymmetric tests 2015-06-20 21:34:11 +02:00
Vincent Breitmoser d472e30b4e instrument: update symmetric tests 2015-06-20 20:43:30 +02:00
Vincent Breitmoser c80d331b96 fix overflow icon 2015-06-20 07:33:14 +02:00
Vincent Breitmoser 4135790161 fix decrypt view intents, save mimetype in storage provider, and thumbnail loading in decrypt list 2015-06-20 07:29:09 +02:00
Vincent Breitmoser 22246afa4b use uris for clipboard data if available in DecryptActivity 2015-06-20 05:30:31 +02:00
Vincent Breitmoser 09da00d800 drop clipboard backwards compatibility for api level < 11 2015-06-20 05:08:49 +02:00
Vincent Breitmoser 3b791f6633 add mimetype and streamtype support in TemporaryStorageProvider 2015-06-20 05:03:40 +02:00
Vincent Breitmoser d11b7b58f1 allow encrypting to clipboard in EncryptFileFragment 2015-06-20 03:34:51 +02:00
Vincent Breitmoser f6bc1dcca3 extract readTextFromUri into FileHelper 2015-06-20 03:34:21 +02:00
Vincent Breitmoser 25beeaceb5 more work on decrypt fragment ux 2015-06-20 03:22:26 +02:00
Vincent Breitmoser b5501eeea6 working DisplayTextActivity, more input support in DecryptActivity 2015-06-20 01:35:33 +02:00
Vincent Breitmoser 36f3887c5f handle empty filename in decrypt list 2015-06-19 20:09:04 +02:00
Vincent Breitmoser ae56f4f900 handle EXTRA_TEXT in decrypt activity 2015-06-19 19:45:27 +02:00
Vincent Breitmoser d1ceb73eb0 save instance state in DecryptListFragment 2015-06-19 18:53:17 +02:00
Vincent Breitmoser 5e5febaee3 rename activities to match new purpose 2015-06-18 16:28:57 +02:00
Vincent Breitmoser 0cfbe4ad06 Merge branch 'master' into v/multi-decrypt 2015-06-18 13:19:44 +02:00
Vincent Breitmoser 2b26f293b8 update code style 2015-06-18 13:16:43 +02:00
Vincent Breitmoser 7c3518a011 more stable nullable behavior in OperationLog 2015-06-18 13:16:38 +02:00
Vincent Breitmoser 0cb868ff25 fix ToolableViewAnimator (againl) 2015-06-18 03:11:29 +02:00
Vincent Breitmoser c11fef6e7c handle multiple input URIs and Intent.SEND_MULTIPLE 2015-06-18 03:10:59 +02:00
Vincent Breitmoser f978aca8e5 fix typo in excluder activity name 2015-06-18 03:09:34 +02:00
Vincent Breitmoser 870ca3f5c3 minor code style fixes 2015-06-18 02:11:32 +02:00
Vincent Breitmoser 3b4ff4644d fix small oversight in ToolableViewAnimator 2015-06-18 02:09:50 +02:00
Vincent Breitmoser 297f53e171 instrument: fix accidentally broken test 2015-06-17 23:11:11 +02:00
Vincent Breitmoser 7f3154ecea Merge branch 'master' into v/multi-decrypt 2015-06-17 21:33:31 +02:00
Vincent Breitmoser f5aa36ef9f fix rest of resource leaks (#1351) 2015-06-17 21:30:25 +02:00
Vincent Breitmoser 5895385153 fix a couple of resource leaks (#1351) 2015-06-17 20:26:06 +02:00
Vincent Breitmoser 374b21410e Merge branch 'v/instrument' into v/multi-decrypt 
Conflicts:
	.travis.yml
	OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
 2015-06-17 19:24:07 +02:00
Vincent Breitmoser 04d2b6a507 use regular runner for most cases 2015-06-17 18:53:50 +02:00
Vincent Breitmoser 9a82b33d16 disable instrumentation tests in travis, it's just too slow 2015-06-17 18:53:49 +02:00
Vincent Breitmoser e3ed2c8e72 just force commit ui test coverage 2015-06-17 18:53:49 +02:00
Vincent Breitmoser cc793c2882 another shot at travis 2015-06-17 18:53:49 +02:00
Vincent Breitmoser 5e77117232 fix filesize reporting in decrypt operation 2015-06-17 18:53:46 +02:00
Vincent Breitmoser 8e60ccb650 workaround for coverage bug (for now!) 
see android bug report https://code.google.com/p/android/issues/detail?id=170607
 2015-06-17 18:53:08 +02:00
Vincent Breitmoser 0d61221c5f instrument: license stuff 2015-06-17 18:53:07 +02:00