Vincent Breitmoser
|
858fe47d46
|
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/KeychainIntentService.java
|
2014-07-15 17:39:36 +02:00 |
|
mar-v-in
|
bc9922263c
|
Add TokenAutoComplete to gradle
|
2014-07-15 01:53:46 +02:00 |
|
Vincent Breitmoser
|
bdde6a3bd8
|
test: use random string as passphrase
|
2014-07-13 16:38:27 +02:00 |
|
Vincent Breitmoser
|
50c91b0799
|
test: add UncachedKeyringTest, stub
|
2014-07-13 16:27:45 +02:00 |
|
Vincent Breitmoser
|
3479850ccc
|
test: work on KeyringTestingHelper methods
|
2014-07-13 16:26:26 +02:00 |
|
Daniel Albert
|
c101ee0240
|
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
|
2014-07-13 15:39:16 +02:00 |
|
Dominik Schürmann
|
0ce9c13132
|
Fix strings from 'keys' to 'passphrases'
|
2014-07-12 21:07:29 +02:00 |
|
Dominik Schürmann
|
af5fddab7c
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-07-12 21:04:57 +02:00 |
|
Dominik Schürmann
|
195f2c25cc
|
Merge pull request #713 from da-kid/master
Added notification to passphrasecache
|
2014-07-12 21:02:19 +02:00 |
|
Dominik Schürmann
|
45dfb39749
|
more work on edit key
|
2014-07-12 20:39:23 +02:00 |
|
Daniel Albert
|
bd909375c2
|
Fixed misplaced bracket
|
2014-07-12 19:24:51 +02:00 |
|
Daniel Albert
|
92c66743e0
|
Added Preference for concealing the PgpApplication
|
2014-07-12 19:19:12 +02:00 |
|
Daniel Albert
|
066591dab1
|
Wello there, That's Java, not C^^
|
2014-07-12 18:53:52 +02:00 |
|
Daniel Albert
|
079194abe5
|
Fixed issues discussed in #713
|
2014-07-12 18:12:03 +02:00 |
|
Daniel Albert
|
7a3fe61a1f
|
Put text into strings.xml, for internationalization
|
2014-07-12 12:52:44 +02:00 |
|
Daniel Albert
|
2568ea4b2e
|
Added Purging for Android < 4.1
|
2014-07-12 12:42:48 +02:00 |
|
Daniel Albert
|
cf40517eac
|
Implemented Notification, no fallback yet
|
2014-07-12 12:27:19 +02:00 |
|
Daniel Albert
|
af90db96a5
|
new PassphraseCache, storing UserIDs as well
|
2014-07-12 10:51:12 +02:00 |
|
Vincent Breitmoser
|
f82093c666
|
modifyKey: error out on integrity check fails
|
2014-07-12 02:02:37 +02:00 |
|
Vincent Breitmoser
|
ed0aec57bf
|
test: more tests for different revocation cases
|
2014-07-12 02:02:03 +02:00 |
|
Vincent Breitmoser
|
22b0e5a1fc
|
test: add test for bad key sanity check
|
2014-07-12 02:01:21 +02:00 |
|
Vincent Breitmoser
|
0e3327c65c
|
createKey: better logging, handle empty user id case
|
2014-07-12 01:29:06 +02:00 |
|
Vincent Breitmoser
|
d4c1b781db
|
test: add algorithm choice tests
|
2014-07-12 01:28:27 +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
|
d4fa2bbf47
|
test: make testing optional in build
|
2014-07-11 19:58:28 +02:00 |
|
Vincent Breitmoser
|
74f510e62b
|
tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic build
|
2014-07-11 19:20:05 +02:00 |
|
Vincent Breitmoser
|
65e75eed93
|
travis: try running tests separately with info output
|
2014-07-11 17:15:17 +02:00 |
|
Vincent Breitmoser
|
faa8c2baa3
|
travis: get rid of lint
|
2014-07-11 16:39:31 +02:00 |
|
Vincent Breitmoser
|
f18e4d109f
|
tests: stronger subkey revocation test including re-certification
|
2014-07-11 16:17:17 +02:00 |
|
Vincent Breitmoser
|
20b28b5207
|
modifyKey: proper expiry check during SubkeyAdd
|
2014-07-11 15:42:02 +02:00 |
|
Vincent Breitmoser
|
46ef001b82
|
test: stronger SubkeyCreate tests
|
2014-07-11 15:41:34 +02:00 |
|
Vincent Breitmoser
|
7b195ac2e3
|
modifyKey: make SubkeyChange operations work
|
2014-07-11 15:20:16 +02:00 |
|
Vincent Breitmoser
|
e7efd2c539
|
test: add SubkeyChange tests
|
2014-07-11 15:19:49 +02:00 |
|
Vincent Breitmoser
|
e00c65ed82
|
test: onlyX vars are lists now, use them as such
|
2014-07-11 14:54:35 +02:00 |
|
Vincent Breitmoser
|
aaecf13ce0
|
(whoops)
|
2014-07-11 13:55:44 +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
|
4345e0309d
|
test: add more user id tests
|
2014-07-11 13:29:13 +02:00 |
|
Vincent Breitmoser
|
9bae53f101
|
test: put more stuff in helper method for neater tests
|
2014-07-11 13:28:28 +02:00 |
|
Vincent Breitmoser
|
d6f3b4b879
|
fix bug in canonicalization regarding subkey revocation
|
2014-07-11 03:27:44 +02:00 |
|
Vincent Breitmoser
|
036a886581
|
test: test subkey revocation
|
2014-07-11 03:27:28 +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
|
b406db24b7
|
test: implement a ton of PgpKeyOperation tests
|
2014-07-11 02:48:08 +02:00 |
|
Vincent Breitmoser
|
d0ff2c9f28
|
test: fix RawPacket comparator
|
2014-07-11 02:47:26 +02:00 |
|
Vincent Breitmoser
|
fa00a5b23c
|
test: finish testSubkeyAdd
|
2014-07-10 21:00:17 +02:00 |
|