Commit Graph

4393 Commits

Author SHA1 Message Date
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
Vincent Breitmoser
3172d7c06f (minor) layout changes 2015-06-13 22:25:02 +02:00
Vincent Breitmoser
8f367b7210 fix instrumentation test(s) 2015-06-13 21:50:57 +02:00
Vincent
655cdfbbee Merge pull request #1338 from josecastillo/development
Improved smart card error handling
2015-06-12 15:00:16 +02:00
Vincent
d57324aa4b Merge pull request #1331 from open-keychain/v/eventbus
replace messenger hack with eventbus
2015-06-12 14:59:26 +02:00
Dominik Schürmann
4f55b1f5d1 Use svg for build status 2015-06-11 22:41:17 +02:00
Vincent Breitmoser
3b67992bab add ToolableViewAnimator 2015-06-11 18:30:39 +02:00
Joey Castillo
cda8b63bb4 Replace AssertionErrors with snackbar notifications, fix style issues. 2015-06-11 11:52:09 -04:00
Vincent Breitmoser
baea318470 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-11 17:12:07 +02:00
Vincent Breitmoser
5d652e4c41 some bugfixes for new CryptoOperationFragment 2015-06-11 17:10:40 +02:00
Vincent Breitmoser
244f92ed57 Merge remote-tracking branch 'origin/master' into v/eventbus 2015-06-11 15:34:55 +02:00
Dominik Schürmann
98ba424576 Fix coveralls 2015-06-11 13:12:45 +02:00
Dominik Schürmann
7f67658de9 Try coveralls support 2015-06-11 12:58:21 +02:00
Dominik Schürmann
b856d82ae2 Jacoco support for local unit tests 2015-06-11 12:54:15 +02:00
Joey Castillo
14226461c1 Improved smart card error handling 2015-06-10 20:11:55 -04:00
Dominik Schürmann
7a5121894e Remove unused deps, fix travis 2015-06-11 00:36:05 +02:00
Dominik Schürmann
7c32098211 Add missing WorkaroundBuildConfig 2015-06-11 00:32:18 +02:00
Dominik Schürmann
6749b03d9a Fix debug/release build separation 2015-06-11 00:31:41 +02:00
Dominik Schürmann
d16b09b2a6 Use new officially supported way for local unit tests, many dependencies upgraded for this, temporary disabled separate debug builds 2015-06-11 00:05:13 +02:00
Dominik Schürmann
05fcbcae7b Temporary fix for testDebug 2015-06-10 22:35:06 +02:00
Dominik Schürmann
260364e267 Use authority res strings 2015-06-10 20:00:29 +02:00
Dominik Schürmann
aa31abd93f Allow debug build besides release build 2015-06-10 19:47:29 +02:00
Vincent Breitmoser
c8790f404a multi-decrypt: switch to cardview 2015-06-10 17:40:00 +02:00
Vincent Breitmoser
a48de4cd84 fix progress for decrypt 2015-06-10 17:39:06 +02:00
Vincent Breitmoser
1697e22d19 Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java
2015-06-10 17:12:22 +02:00
Vincent Breitmoser
8da88f33bc fix unit tests 2015-06-10 17:09:55 +02:00
Vincent Breitmoser
61dce088c2 backport CryptoOperationFragment changes without eventbus 2015-06-10 15:45:10 +02:00