moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity
4,369 Commits 12 Branches 24 Tags 116 MiB
3b4ff4644d
Commit Graph

4369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser
3b4ff4644d fix small oversight in ToolableViewAnimator 2015-06-18 02:09:50 +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
Vincent Breitmoser
d445b4d2e0 try travis with android lang type 2015-06-17 18:52:05 +02:00
Vincent Breitmoser
2c47035e02 (minor) layout changes 2015-06-17 18:52:03 +02:00
Vincent Breitmoser
5e4842ab64 fix instrumentation test(s) 2015-06-17 18:51:50 +02:00
Vincent Breitmoser
66e7876abd add ToolableViewAnimator 2015-06-17 18:51:45 +02:00
Dominik Schürmann
0b3317600b Cleanup in build.gradle 2015-06-16 00:08:17 +02:00
Vincent Breitmoser
1a7677008b fix status icon alignment 2015-06-14 01:39:58 +02:00
Vincent Breitmoser
3f224141f6 travis: disable instrumentation for now 2015-06-14 00:17:48 +02:00
Vincent Breitmoser
681036da5b travis: random testing 2015-06-13 23:39:08 +02:00
Vincent Breitmoser
cfaecf568b add instrumentation tests 2015-06-13 22:38:54 +02:00
Vincent Breitmoser
5d01372cd1 try travis with android lang type 2015-06-13 22:30:57 +02:00