Commit Graph

2375 Commits

Author SHA1 Message Date
Dominik Schürmann
8385c9c9dd Update README 2014-07-19 15:14:20 +02:00
Vincent Breitmoser
cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Vincent Breitmoser
299570f1b9 test: start with UncachedKeyRing.canonicalize tests 2014-07-19 02:12:04 +02:00
Vincent Breitmoser
19dc49153d use jacoco for test coverage 2014-07-19 01:31:34 +02:00
Vincent Breitmoser
6d9eaaabb2 work on test prepare script, make the whole thing optional 2014-07-18 19:05:38 +02:00
Dominik Schürmann
94e56a4542 Merge branch 'da-kid-master' 2014-07-18 09:49:51 +02:00
Dominik Schürmann
b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master
Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
2014-07-18 09:49:20 +02:00
Dominik Schürmann
306bea5ee9 Removed OpenPGP-haskell submodule 2014-07-18 09:39:36 +02:00
Dominik Schürmann
3d74a9c11c Add OpenPGP-Haskell test files directly 2014-07-18 09:34:54 +02:00
Daniel Albert
cc63b0e72c Fixed gitmodules 2014-07-17 22:00:24 +02:00
Daniel Albert
db002bde7c Fixed another unescaped apostrophe. 2014-07-17 21:17:39 +02:00
Daniel Albert
8a8d8c5a68 Fixed unescaped apostrophe 2014-07-17 20:53:10 +02:00
Daniel Albert
01046fc0e7 Added description to Setting, Changed title to suggested one 2014-07-17 20:01:53 +02:00
Daniel Albert
f15df98ab5 Hopefully fixes Travis build errors 2014-07-16 19:59:55 +02:00
Daniel Albert
d63534d655 Merge remote-tracking branch 'upstream/master'
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
2014-07-16 18:49:16 +02:00
Daniel Albert
e375cde7e1 Final Commit for #662 2014-07-16 18:17:46 +02:00
Dominik Schürmann
82af9672fd Temporary program flow fixes 2014-07-16 10:07:50 +02:00
Dominik Schürmann
77d04a915b Simple create key 2014-07-16 10:05:00 +02:00
Dominik Schürmann
57f5a788fd Simple create key 2014-07-16 10:04:48 +02:00
Dominik Schürmann
c1c831e52b New first time screen 2014-07-16 09:49:37 +02:00
Dominik Schürmann
d3c54d5f12 Fallback if no primary user id exists 2014-07-16 00:22:45 +02:00
Vincent Breitmoser
64b87f75be move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) 2014-07-15 19:47:52 +02:00
Dominik Schürmann
848043a481 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:34:01 +02:00
Vincent Breitmoser
501d4b887a signatures: a revocation reason does NOT determine if a cert is a revocation type 2014-07-15 19:31:27 +02:00
Dominik Schürmann
503b146a14 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:22:44 +02:00
Dominik Schürmann
72237a0892 some fixes for edit 2014-07-15 19:22:40 +02:00
Vincent Breitmoser
2f35e07c9e Merge remote-tracking branch 'origin/master' into external-test 2014-07-15 19:17:43 +02:00
Vincent Breitmoser
29145e49c9 merge: different msg if nothing was merged 2014-07-15 19:17:08 +02:00
Dominik Schürmann
e1d505a291 Update README with build instructions for build 2014-07-15 17:51:31 +02:00
Vincent
d8f941fa70 Merge pull request #711 from open-keychain/external-test
External test + working SaveKeyringParcel
2014-07-15 17:40:21 +02:00
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
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