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
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
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
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
Vincent Breitmoser
3b67992bab
add ToolableViewAnimator
2015-06-11 18:30:39 +02: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
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
Vincent Breitmoser
9b6416943b
Merge remote-tracking branch 'origin/master' into v/eventbus
2015-06-10 14:49:02 +02:00
Vincent Breitmoser
0505af7520
select correct item in drawer on backstack change in main activity
2015-06-08 16:18:16 +02:00
Vincent Breitmoser
d43671b2ed
multi-decrypt: fix progress with new CryptoFragment interfaces
2015-06-07 02:00:14 +02:00
Vincent Breitmoser
cfa2ecca61
WIP! Merge branch 'v/eventbus' into v/multi-decrypt
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
2015-06-07 00:05:14 +02:00
Vincent Breitmoser
b779211f55
Merge branch 'master' into v/multi-decrypt
...
this also fixes weird-bug
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
OpenKeychain/src/main/res/values/strings.xml
2015-06-06 23:40:22 +02:00
Vincent Breitmoser
074b6633b0
eventbus: initial attempt, replace messenger hack with eventbus communication
2015-06-06 23:17:42 +02:00
Vincent Breitmoser
fa61438306
multi-decrypt: implement save operation (missing actual copy)
2015-06-03 17:01:29 +02:00
Vincent Breitmoser
6db9de221c
multi-decrypt: working context menu
2015-06-03 16:47:46 +02:00
Vincent Breitmoser
5496b42fe6
get back to a working state
2015-06-03 02:04:43 +02:00
Vincent Breitmoser
5917303c1d
update spongycastle with branch-specific patch stack
2015-06-03 01:38:40 +02:00
Vincent Breitmoser
7cfc0d80d0
Merge branch 'v/sticky-prefs'
2015-06-03 01:23:51 +02:00
Vincent Breitmoser
ecfbc743f3
keep prefernces individual per dialog (affects only compression)
2015-06-03 01:21:06 +02:00
Vincent Breitmoser
bd5a5c0138
Partially revert "switch to native DialogFragment, fix some nullpointers", but keep nullpointer fixes
...
This reverts commit 403f74f558
2015-06-03 01:16:44 +02:00
Vincent Breitmoser
b3ebb64666
hide invoke nfc button in android < 5
2015-06-03 01:08:32 +02:00
Vincent Breitmoser
441704f163
multi-decrypt: working in principle
2015-06-02 22:19:28 +02:00
Vincent Breitmoser
fc9a7bfcb3
multi-decrypt: working recyclerview which decrypt files sequentially, ui in progress
2015-06-02 12:14:27 +02:00
Vincent Breitmoser
04d6fd62c8
check for cached session keys in some tests
2015-06-01 12:02:05 +02:00
Vincent Breitmoser
cee1a8c753
multi-decrypt: first steps, split up DecryptFilesFragment
2015-06-01 03:23:51 +02:00
Vincent Breitmoser
dbfa55f6b9
introduce CachingDataDecryptorFactory towards cached session keys
...
this commit introduces the CachingDataDecryptorFactory, which wraps
a DataDecryptorFactory but supports caching of decrypted session keys.
this change also gets rid of runtimeexception based control flow in
PgpDecryptVerify.
2015-06-01 00:52:18 +02:00
Vincent Breitmoser
403f74f558
switch to native DialogFragment, fix some nullpointers
2015-05-31 19:45:25 +02:00
Vincent Breitmoser
204893a025
fix small non-deterministic failure case in unit test
2015-05-31 05:41:18 +02:00
Vincent Breitmoser
1bc14ab6ae
revert some accidentally committed cruft
2015-05-31 05:22:14 +02:00
Vincent Breitmoser
cf5fadae76
implement sticky preferences
2015-05-31 05:18:58 +02:00
Vincent Breitmoser
3976eadf06
handle empty passphrases in PassphraseDialogActivity
2015-05-31 05:16:41 +02:00
Vincent
5d87872245
Merge pull request #1318 from adithyaphilip/remove-nan
...
Prevent NaN Progress Dialog on import with no selected keys
2015-05-30 23:16:07 +02:00
Vincent Breitmoser
3be44898db
only promote subkeys which are actually present
2015-05-30 14:08:49 +02:00
Vincent Breitmoser
ef209450c6
some decrypt/verify bug fixes
2015-05-30 13:52:56 +02:00
Vincent Breitmoser
99fe806ea3
adapt unit tests to PgpDecryptVerifyInputParcel
2015-05-30 13:52:35 +02:00
Vincent Breitmoser
0d8370be1d
rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel
2015-05-30 13:25:47 +02:00
Vincent Breitmoser
36ecd60c1b
better error handling for bad encrypted data checksum
2015-05-30 13:09:09 +02:00
Vincent Breitmoser
bde58c6ff1
delete correct cache entries (important for yubikey pins!)
2015-05-30 02:47:14 +02:00
Vincent Breitmoser
61a6346f89
show status indicators in EncryptFragment
2015-05-30 02:24:45 +02:00
Vincent Breitmoser
313b4ac7d3
rewrite data flow in EncryptFileFragment preserve state correctly
2015-05-30 00:20:11 +02:00
Vincent Breitmoser
b9563ff2ef
externalize caching functionality from CertifyKeyFragment
2015-05-30 00:17:00 +02:00
Vincent Breitmoser
1406eec2dc
make KeyItem serializble, for state in TokenTextCompleteView
2015-05-30 00:16:27 +02:00
Vincent Breitmoser
8be6450a36
preserve state in DecryptFilesActivity/-Fragment
2015-05-29 21:38:20 +02:00
Vincent Breitmoser
c9f9af6603
preserve state in CertifyKeyFragment
2015-05-29 21:07:56 +02:00
Vincent Breitmoser