Commit Graph

4379 Commits

Author SHA1 Message Date
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
Dominik Schürmann
300fd8e0f2 Merge pull request #1352 from open-keychain/v/instrument
instrumentation branch
2015-06-17 19:56:13 +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
Vincent Breitmoser
0c20d40863 instrument: import public keys as public 2015-06-17 18:53:07 +02:00
Vincent Breitmoser
7b416d7d7d instrument: test EncryptKeyCompletionView 2015-06-17 18:53:06 +02:00
Vincent Breitmoser
04e9137b66 instrument: use contrib drawer methods, respect passphrase cache 2015-06-17 18:53:05 +02:00
Vincent Breitmoser
d2cdfb34fa work on asymmetric operation instrumentation tests 2015-06-17 18:53:04 +02:00
Vincent Breitmoser
d12d469714 some cleanup in instrumentation tests 2015-06-17 18:53:04 +02:00
Vincent Breitmoser
e85982a419 nicer preview of decrypt_text_fragment layout 2015-06-17 18:53:03 +02:00
Vincent Breitmoser
3755bce9ce fix nullpointer in ViewKeyFragment 2015-06-17 18:53:02 +02:00
Vincent Breitmoser
7d371d8a39 fix returned text of cleartext verify 2015-06-17 18:53:02 +02:00
Vincent Breitmoser
f677446d51 use KeyAdapter in KeySpinner 2015-06-17 18:53:01 +02:00
Vincent Breitmoser
b87a7372c9 improve preview of ViewKeyActivity layout 2015-06-17 18:53:00 +02:00
Vincent Breitmoser
84165c092e fix symmetric text decryption 2015-06-17 18:53:00 +02:00
Vincent Breitmoser
2d03965777 instrument: finish symmetric text encryption test 2015-06-17 18:53:00 +02:00
Vincent Breitmoser
312cb38848 preliminary EditKeyTest 2015-06-17 18:52:59 +02:00
Vincent Breitmoser
71ea521198 clean up helper code, add withKeyItemId matcher for KeyListAdapter 2015-06-17 18:52:59 +02:00
Vincent Breitmoser
b8305d43dc return actual last log entry, including from sublogentryparcels 2015-06-17 18:52:59 +02:00
Vincent Breitmoser
b7834b4326 fix recursive log in modifySecretKeyRing 2015-06-17 18:52:58 +02:00
Vincent Breitmoser
ae199313ee instrument: change handling in PassphraseDialogActivity to work with espresso 2015-06-17 18:52:21 +02:00
Vincent Breitmoser
db0266c0ae instrument: work on instrumentation tests 2015-06-17 18:52:20 +02:00
Vincent Breitmoser
908545e521 instrument: add test for symmetric text encrypt/decrypt 2015-06-17 18:52:20 +02:00
Vincent Breitmoser
fe4659f8d6 instrument: add helper for snackbar check (2) 2015-06-17 18:52:20 +02:00
Vincent Breitmoser
34c7252048 add extra to disregard first-time dialog to main activity 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
7998b2a262 instrument: add helper method for snackbar checking 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
6f47c78981 stash away stuff 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
442aed8a2d update instrumentation test to JUnit4 2015-06-17 18:52:19 +02:00
Vincent Breitmoser
46e75a085e travis: disable instrumentation for now 2015-06-17 18:52:06 +02:00
Vincent Breitmoser
fb87f2ed2a travis: random testing 2015-06-17 18:52:05 +02:00
Vincent Breitmoser
d599825046 add instrumentation tests 2015-06-17 18:52:05 +02:00