PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Commit graph

  • b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master Dominik Schürmann 2014-07-18 09:49:20 +02:00
  • d8ada7c1bb Merge branch 'master' into yubikey Dominik Schürmann 2014-07-18 09:47:24 +02:00
  • 306bea5ee9 Removed OpenPGP-haskell submodule Dominik Schürmann 2014-07-18 09:39:36 +02:00
  • 3d74a9c11c Add OpenPGP-Haskell test files directly Dominik Schürmann 2014-07-18 09:34:54 +02:00
  • cc63b0e72c Fixed gitmodules Daniel Albert 2014-07-17 22:00:24 +02:00
  • db002bde7c Fixed another unescaped apostrophe. Daniel Albert 2014-07-17 21:17:39 +02:00
  • 69c38c3f34 Update lib Dominik Schürmann 2014-07-17 21:14:42 +02:00
  • 8a8d8c5a68 Fixed unescaped apostrophe Daniel Albert 2014-07-17 20:53:10 +02:00
  • 45611a33fb Update libs Dominik Schürmann 2014-07-17 20:30:41 +02:00
  • f2a6064e38 Fixes Dominik Schürmann 2014-07-17 20:29:07 +02:00
  • 01046fc0e7 Added description to Setting, Changed title to suggested one Daniel Albert 2014-07-17 20:01:53 +02:00
  • f15df98ab5 Hopefully fixes Travis build errors Daniel Albert 2014-07-16 19:59:55 +02:00
  • d63534d655 Merge remote-tracking branch 'upstream/master' Daniel Albert 2014-07-16 18:49:16 +02:00
  • e375cde7e1 Final Commit for #662 Daniel Albert 2014-07-16 18:17:46 +02:00
  • 3cce00d61e add lib dependency, update lib Dominik Schürmann 2014-07-16 11:00:32 +02:00
  • e531da4036 Add nfc lib Dominik Schürmann 2014-07-16 10:22:51 +02:00
  • 82af9672fd Temporary program flow fixes Dominik Schürmann 2014-07-16 10:07:50 +02:00
  • 77d04a915b Simple create key Dominik Schürmann 2014-07-16 10:05:00 +02:00
  • 57f5a788fd Simple create key Dominik Schürmann 2014-07-16 10:04:48 +02:00
  • c1c831e52b New first time screen Dominik Schürmann 2014-07-16 09:49:37 +02:00
  • d3c54d5f12 Fallback if no primary user id exists Dominik Schürmann 2014-07-16 00:22:45 +02:00
  • 64b87f75be move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) Vincent Breitmoser 2014-07-15 19:47:40 +02:00
  • 848043a481 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-07-15 19:34:01 +02:00
  • 501d4b887a signatures: a revocation reason does NOT determine if a cert is a revocation type Vincent Breitmoser 2014-07-15 19:31:27 +02:00
  • 503b146a14 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-07-15 19:22:44 +02:00
  • 72237a0892 some fixes for edit Dominik Schürmann 2014-07-15 19:22:40 +02:00
  • 2f35e07c9e Merge remote-tracking branch 'origin/master' into external-test Vincent Breitmoser 2014-07-15 19:17:43 +02:00
  • 29145e49c9 merge: different msg if nothing was merged Vincent Breitmoser 2014-07-15 19:17:08 +02:00
  • e1d505a291 Update README with build instructions for build Dominik Schürmann 2014-07-15 17:51:31 +02:00
  • d8f941fa70 Merge pull request #711 from open-keychain/external-test Vincent 2014-07-15 17:40:21 +02:00
  • 858fe47d46 Merge remote-tracking branch 'origin/master' into external-test Vincent Breitmoser 2014-07-15 17:39:36 +02:00
  • bc9922263c Add TokenAutoComplete to gradle mar-v-in 2014-07-15 01:53:46 +02:00
  • bdde6a3bd8 test: use random string as passphrase Vincent Breitmoser 2014-07-13 16:37:27 +02:00
  • 50c91b0799 test: add UncachedKeyringTest, stub Vincent Breitmoser 2014-07-13 16:27:45 +02:00
  • 3479850ccc test: work on KeyringTestingHelper methods Vincent Breitmoser 2014-07-13 16:26:26 +02:00
  • c101ee0240 Merge remote-tracking branch 'upstream/master' into feature-conceal-software Daniel Albert 2014-07-13 15:39:16 +02:00
  • 0ce9c13132 Fix strings from 'keys' to 'passphrases' Dominik Schürmann 2014-07-12 21:07:29 +02:00
  • af5fddab7c Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-07-12 21:04:57 +02:00
  • 195f2c25cc Merge pull request #713 from da-kid/master Dominik Schürmann 2014-07-12 21:02:19 +02:00
  • 45dfb39749 more work on edit key Dominik Schürmann 2014-07-12 20:39:23 +02:00
  • bd909375c2 Fixed misplaced bracket Daniel Albert 2014-07-12 19:24:51 +02:00
  • 92c66743e0 Added Preference for concealing the PgpApplication Daniel Albert 2014-07-12 15:12:35 +02:00
  • 066591dab1 Wello there, That's Java, not C^^ Daniel Albert 2014-07-12 18:53:52 +02:00
  • 079194abe5 Fixed issues discussed in #713 Daniel Albert 2014-07-12 18:12:03 +02:00
  • 7a3fe61a1f Put text into strings.xml, for internationalization Daniel Albert 2014-07-12 12:52:44 +02:00
  • 2568ea4b2e Added Purging for Android < 4.1 Daniel Albert 2014-07-12 12:42:48 +02:00
  • cf40517eac Implemented Notification, no fallback yet Daniel Albert 2014-07-12 12:27:19 +02:00
  • af90db96a5 new PassphraseCache, storing UserIDs as well Daniel Albert 2014-07-12 10:51:12 +02:00
  • f82093c666 modifyKey: error out on integrity check fails Vincent Breitmoser 2014-07-12 02:02:37 +02:00
  • ed0aec57bf test: more tests for different revocation cases Vincent Breitmoser 2014-07-12 02:02:03 +02:00
  • 22b0e5a1fc test: add test for bad key sanity check Vincent Breitmoser 2014-07-12 02:01:21 +02:00
  • 0e3327c65c createKey: better logging, handle empty user id case Vincent Breitmoser 2014-07-12 01:29:06 +02:00
  • d4c1b781db test: add algorithm choice tests Vincent Breitmoser 2014-07-12 01:28:27 +02:00
  • 54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test Vincent Breitmoser 2014-07-11 20:21:19 +02:00
  • d4fa2bbf47 test: make testing optional in build Vincent Breitmoser 2014-07-11 19:58:28 +02:00
  • 74f510e62b tests: set maxParallelForks = 1, maybe this fixes travis non-deterministic build Vincent Breitmoser 2014-07-11 19:19:49 +02:00
  • 65e75eed93 travis: try running tests separately with info output Vincent Breitmoser 2014-07-11 16:51:10 +02:00
  • faa8c2baa3 travis: get rid of lint Vincent Breitmoser 2014-07-11 16:39:31 +02:00
  • f18e4d109f tests: stronger subkey revocation test including re-certification Vincent Breitmoser 2014-07-11 16:17:17 +02:00
  • 20b28b5207 modifyKey: proper expiry check during SubkeyAdd Vincent Breitmoser 2014-07-11 15:42:02 +02:00
  • 46ef001b82 test: stronger SubkeyCreate tests Vincent Breitmoser 2014-07-11 15:41:34 +02:00
  • 7b195ac2e3 modifyKey: make SubkeyChange operations work Vincent Breitmoser 2014-07-11 15:20:16 +02:00
  • e7efd2c539 test: add SubkeyChange tests Vincent Breitmoser 2014-07-11 15:19:49 +02:00
  • e00c65ed82 test: onlyX vars are lists now, use them as such Vincent Breitmoser 2014-07-11 14:54:35 +02:00
  • aaecf13ce0 (whoops) Vincent Breitmoser 2014-07-11 13:55:44 +02:00
  • 1436ab8d90 SaveKeyringParcel: follow attribute m prefix coding guideline Vincent Breitmoser 2014-07-11 13:51:36 +02:00
  • bb92fe2804 test: get rid of some SaveKeyringParcel boilerplate Vincent Breitmoser 2014-07-11 13:49:17 +02:00
  • 26f6d58284 get rid of some inspection warnings Vincent Breitmoser 2014-07-11 13:37:31 +02:00
  • 4da273ac16 modifyKey: error out on nonexisting new primary user id Vincent Breitmoser 2014-07-11 13:35:48 +02:00
  • 4345e0309d test: add more user id tests Vincent Breitmoser 2014-07-11 13:29:13 +02:00
  • 9bae53f101 test: put more stuff in helper method for neater tests Vincent Breitmoser 2014-07-11 13:28:28 +02:00
  • d6f3b4b879 fix bug in canonicalization regarding subkey revocation Vincent Breitmoser 2014-07-11 03:27:44 +02:00
  • 036a886581 test: test subkey revocation Vincent Breitmoser 2014-07-11 03:27:28 +02:00
  • f6e39b0a97 modifyKey: couple more fixes from tests Vincent Breitmoser 2014-07-11 02:51:13 +02:00
  • e477577c55 some UncachedKeyRing fixes, primary user id mostly Vincent Breitmoser 2014-07-11 02:50:35 +02:00
  • 38ee6203ad modifyKey: preserve master key flags Vincent Breitmoser 2014-07-11 02:49:51 +02:00
  • dce2df4113 add come createKey strings Vincent Breitmoser 2014-07-11 02:48:54 +02:00
  • b406db24b7 test: implement a ton of PgpKeyOperation tests Vincent Breitmoser 2014-07-11 02:48:08 +02:00
  • d0ff2c9f28 test: fix RawPacket comparator Vincent Breitmoser 2014-07-11 02:47:26 +02:00
  • fa00a5b23c test: finish testSubkeyAdd Vincent Breitmoser 2014-07-10 21:00:17 +02:00
  • 0e7d4f644b Revert "test: add --info to travis thing, for testing" Vincent Breitmoser 2014-07-10 02:18:35 +02:00
  • 7532baa6c7 test: add --info to travis thing, for testing Vincent Breitmoser 2014-07-10 02:08:23 +02:00
  • 6f0e3c242a test: enable travis, disable dysfunctional tests to make it work Vincent Breitmoser 2014-07-10 01:56:21 +02:00
  • 90f546a4e8 tests: add testSubkeyAdd Vincent Breitmoser 2014-07-10 01:38:57 +02:00
  • 0afd979665 test: move uncachedkeyring test setup into BeforeClass method Vincent Breitmoser 2014-07-09 20:35:03 +02:00
  • a99589e9c4 use openjdk7 in travis Vincent Breitmoser 2014-07-09 17:41:13 +02:00
  • 09529bc47e tests: fix createkey test Vincent Breitmoser 2014-07-09 17:41:01 +02:00
  • a9c3d6b507 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test Vincent Breitmoser 2014-07-09 16:39:26 +02:00
  • 718acbf954 put unit tests into external module (CAVEAT) Vincent Breitmoser 2014-07-09 15:53:18 +02:00
  • 9fcc0a8816 Merge pull request #710 from mar-v-in/patch-1 Vincent 2014-07-09 11:26:59 +02:00
  • 5185492b04 Fix OperationResultParcel mar-v-in 2014-07-09 00:10:09 +02:00
  • 16498be4a2 Fix nullpointer in API, fix #693 Dominik Schürmann 2014-07-08 04:24:27 +02:00
  • 61d0e12e8a cleanup Dominik Schürmann 2014-07-08 03:37:32 +02:00
  • daa1f5cf8e Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-07-08 03:34:53 +02:00
  • 5adcb7885c Work on subkeys adapter Dominik Schürmann 2014-07-08 03:34:27 +02:00
  • 78b0c5e74a actually provide a tostring Art O Cathain 2014-07-07 21:38:49 +01:00
  • 37433bd282 prevent odd ambiguous method toString error Art O Cathain 2014-07-07 21:37:48 +01:00
  • 51bedc2e73 (c) headers, tidy imports Art O Cathain 2014-07-07 21:31:32 +01:00
  • 9971f9ad4c use KeyringTestHelper.diffKeyrings method for unit test Vincent Breitmoser 2014-07-07 18:53:41 +02:00
  • 83e5a3d341 add diffKeyrings method Vincent Breitmoser 2014-07-07 18:30:08 +02:00