Vincent Breitmoser
f82093c666
modifyKey: error out on integrity check fails
2014-07-12 02:02:37 +02:00
Vincent Breitmoser
0e3327c65c
createKey: better logging, handle empty user id case
2014-07-12 01:29:06 +02:00
Vincent Breitmoser
54bc874ce5
Merge remote-tracking branch 'origin/master' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
Vincent Breitmoser
20b28b5207
modifyKey: proper expiry check during SubkeyAdd
2014-07-11 15:42:02 +02:00
Vincent Breitmoser
7b195ac2e3
modifyKey: make SubkeyChange operations work
2014-07-11 15:20:16 +02:00
Vincent Breitmoser
1436ab8d90
SaveKeyringParcel: follow attribute m prefix coding guideline
2014-07-11 13:51:36 +02:00
Vincent Breitmoser
bb92fe2804
test: get rid of some SaveKeyringParcel boilerplate
2014-07-11 13:49:17 +02:00
Vincent Breitmoser
26f6d58284
get rid of some inspection warnings
2014-07-11 13:45:06 +02:00
Vincent Breitmoser
4da273ac16
modifyKey: error out on nonexisting new primary user id
2014-07-11 13:35:48 +02:00
Vincent Breitmoser
d6f3b4b879
fix bug in canonicalization regarding subkey revocation
2014-07-11 03:27:44 +02:00
Vincent Breitmoser
f6e39b0a97
modifyKey: couple more fixes from tests
2014-07-11 02:51:13 +02:00
Vincent Breitmoser
e477577c55
some UncachedKeyRing fixes, primary user id mostly
2014-07-11 02:50:35 +02:00
Vincent Breitmoser
38ee6203ad
modifyKey: preserve master key flags
2014-07-11 02:49:51 +02:00
Vincent Breitmoser
dce2df4113
add come createKey strings
2014-07-11 02:48:54 +02:00
Vincent Breitmoser
90f546a4e8
tests: add testSubkeyAdd
2014-07-10 01:38:57 +02:00
Vincent Breitmoser
a9c3d6b507
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
2014-07-09 16:39:26 +02:00
Vincent Breitmoser
718acbf954
put unit tests into external module (CAVEAT)
...
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
2014-07-09 16:03:30 +02:00
mar-v-in
5185492b04
Fix OperationResultParcel
...
Naming conventions save lives... or atleast make addAll() work
2014-07-09 00:10:09 +02:00
Dominik Schürmann
16498be4a2
Fix nullpointer in API, fix #693
2014-07-08 04:24:27 +02:00
Dominik Schürmann
61d0e12e8a
cleanup
2014-07-08 03:37:32 +02:00
Dominik Schürmann
daa1f5cf8e
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-08 03:34:53 +02:00
Dominik Schürmann
5adcb7885c
Work on subkeys adapter
2014-07-08 03:34:27 +02:00
Art O Cathain
78b0c5e74a
actually provide a tostring
2014-07-07 21:38:49 +01:00
Art O Cathain
37433bd282
prevent odd ambiguous method toString error
2014-07-07 21:37:48 +01:00
Art O Cathain
51bedc2e73
(c) headers, tidy imports
2014-07-07 21:35:10 +01:00
Vincent Breitmoser
9971f9ad4c
use KeyringTestHelper.diffKeyrings method for unit test
...
Conflicts:
OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
2014-07-07 21:12:50 +01:00
Vincent Breitmoser
83e5a3d341
add diffKeyrings method
2014-07-07 21:08:48 +01:00
Vincent Breitmoser
9320d2d8a2
use KeyringTestHelper.diffKeyrings method for unit test
2014-07-07 19:02:57 +02:00
Vincent Breitmoser
23524af81d
add diffKeyrings method
2014-07-07 18:52:59 +02:00
Vincent Breitmoser
e54dd26d29
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
2014-07-07 18:19:52 +02:00
Art O Cathain
4fbffd7bb4
Actually test canonicalize
2014-07-06 19:43:38 +01:00
Art O Cathain
e906fe5387
add the GPG version
2014-07-06 19:43:24 +01:00
Art O Cathain
c05fd07986
data fixes
2014-07-06 19:43:24 +01:00
Art O Cathain
9032e032ff
add toString for test ease
2014-07-06 19:43:17 +01:00
Art O Cathain
5479eafd4b
actually canonicalize
2014-07-06 19:42:51 +01:00
Art O Cathain
cb64f8865c
work in progress
2014-07-06 19:42:51 +01:00
Art O Cathain
b02519ce25
add toString for test ease
2014-07-06 15:50:07 +01:00
Art O Cathain
22108cf4e2
actually canonicalize
2014-07-06 15:50:07 +01:00
Art O Cathain
80e09bd05e
work in progress
2014-07-06 15:50:07 +01:00
Art O Cathain
ccb1579864
Prefer composition to inheritance is the mantra these das
2014-07-06 15:23:39 +01:00
Dominik Schürmann
3363507be4
Bett API string
2014-07-04 09:52:25 +02:00
Dominik Schürmann
709196f774
Use strings in edit key
2014-07-03 16:49:25 +02:00
Dominik Schürmann
e006d4762c
Pull from transifex
2014-07-03 16:38:22 +02:00
Dominik Schürmann
9e56e53cf1
Pull from transifex
2014-07-03 16:30:41 +02:00
Dominik Schürmann
3085f0d229
Small strings fix
2014-07-03 16:24:10 +02:00
Dominik Schürmann
1ba41e7482
Remove old edit button, rename activities
2014-07-03 16:21:16 +02:00
Dominik Schürmann
bd7b4ccf2b
cleanup, debug for passphrase set
2014-07-03 15:58:03 +02:00
Dominik Schürmann
6ca9d8a268
fix no passphrase check
2014-07-03 15:54:07 +02:00
Dominik Schürmann
b9d2ae938a
Cache passphrase for edit
2014-07-03 15:49:46 +02:00
Dominik Schürmann
2988ac6e7b
Cache passphrase for edit
2014-07-03 15:48:46 +02:00
