Commit Graph

Select branches

Hide Pull Requests

pvabel

Mono Color

• 41545e5e52 Added notification wrapper for toast like notifys Daniel Haß 2014-06-15 19:59:41 +02:00
• 81344389e5 Merge pull request #654 from artbristol/master Dominik Schürmann 2014-06-14 15:54:22 +02:00
• 63861fa60b Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error Art O Cathain 2014-06-14 13:16:39 +01:00
• 9d77790729 Merge branch 'canonicalize' Vincent Breitmoser 2014-06-13 00:33:13 +02:00
• ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize Vincent Breitmoser 2014-06-12 23:57:21 +02:00
• 073433fa74 canonicalize: require primary key binding certificates for signing subkeys Vincent Breitmoser 2014-06-12 23:10:44 +02:00
• 79131be5f0 canonicalize: simplify import with info from canonicalization Vincent Breitmoser 2014-06-12 22:27:32 +02:00
• 0594d9156e canonicalize: filter out future and local certificates Vincent Breitmoser 2014-06-12 21:57:03 +02:00
• 9dd40b7238 import-log: more minor improvements Vincent Breitmoser 2014-06-12 18:17:35 +02:00
• 59701250ba import: use wrapped keyring instead of uncached keyring for trust Vincent Breitmoser 2014-06-12 18:11:31 +02:00
• e4a7d4f6e5 import-log: minor improvements Vincent Breitmoser 2014-06-12 18:10:48 +02:00
• dae503284f canonicalize: more stuff Vincent Breitmoser 2014-06-12 17:38:48 +02:00
• 466eddb005 canonicalize: implementation, first draft Vincent Breitmoser 2014-06-12 15:36:35 +02:00
• dea98a4a7e import-log: properly distinguish return states Vincent Breitmoser 2014-06-12 01:52:41 +02:00
• 47368f1d24 import-log: better way to check self trust, and fix log level filtering Vincent Breitmoser 2014-06-12 01:37:49 +02:00
• 8d75d3e00e import-log: use holder pattern in log fragment Vincent Breitmoser 2014-06-11 00:37:23 +02:00
• e106079b90 Delete using Document API (unsafe) mar-v-in 2014-06-10 21:53:02 +02:00
• f55bc41682 Use Document API on KitKat for file encrypt/decrypt mar-v-in 2014-06-10 20:57:48 +02:00
• 3895c10a58 import-log: work on log fragment ui Vincent Breitmoser 2014-06-10 20:06:28 +02:00
• f38556cab1 import-log: switch to flags instead of statuses for result int Vincent Breitmoser 2014-06-10 16:24:04 +02:00
• e41e6ea0de import-log: more interface work Vincent Breitmoser 2014-06-10 15:27:26 +02:00
• eac582a313 import-log: some cosmetics Vincent Breitmoser 2014-06-10 13:52:05 +02:00
• 7324bfcb53 import-log: add LogDisplay activity Vincent Breitmoser 2014-06-10 01:53:25 +02:00
• d73a3e2fa8 import-log: use supertoast in ImportKeyActivity Vincent Breitmoser 2014-06-10 01:52:38 +02:00
• cdc61c4392 canonicalize: first step(s) Vincent Breitmoser 2014-06-10 01:51:16 +02:00
• 067ffa876d import-log: add OperationResults, use it in ImportKeys operation Vincent Breitmoser 2014-06-10 01:30:20 +02:00
• 97c679ada3 import-log: add SuperToast external library Vincent Breitmoser 2014-06-10 01:23:24 +02:00
• 70d454785f Update example code instructions Dominik Schürmann 2014-06-09 22:51:13 +02:00
• 2b825c8df7 Update README for build tools Dominik Schürmann 2014-06-09 22:30:12 +02:00
• 73a825a152 Really fix travis Dominik Schürmann 2014-06-09 22:14:30 +02:00
• cb3c2b2008 Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 Dominik Schürmann 2014-06-09 22:09:30 +02:00
• de6fe46eca Fix travis for buildTools 19.1 Dominik Schürmann 2014-06-09 22:02:04 +02:00
• fe1b8468a1 Update buildTools to 19.1 Dominik Schürmann 2014-06-09 21:55:32 +02:00
• d530a7b0ee Update buildTools to 19.1 Dominik Schürmann 2014-06-09 21:52:17 +02:00
• 08d63340c9 Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) mar-v-in 2014-06-08 21:30:11 +02:00
• 90f9646f25 Merge pull request #650 from open-keychain/v/import-log Dominik Schürmann 2014-06-06 23:07:06 +02:00
• a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery Dominik Schürmann 2014-06-06 22:57:51 +02:00
• d2430fe0e3 Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage Dominik Schürmann 2014-06-06 22:47:28 +02:00
• 341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them Dominik Schürmann 2014-06-06 22:46:39 +02:00
• 5601f1b76f Fix TAG in account service as well mar-v-in 2014-06-06 17:42:28 +02:00
• 55ca0841f6 Fixing TAG and string resource mar-v-in 2014-06-06 17:39:11 +02:00
• c36b311d5f import-log: better stripped key logging Vincent Breitmoser 2014-06-06 17:29:39 +02:00
• 118225d7d2 import-log: add output to logcat (for debugging) Vincent Breitmoser 2014-06-06 17:28:36 +02:00
• e083ccc370 import-log: add import log string resources Vincent Breitmoser 2014-06-06 16:15:45 +02:00
• 787f6edf32 import-log: add log statements in import routine Vincent Breitmoser 2014-06-06 16:15:27 +02:00
• b995b836a3 import-log: improve operationresultparcel, add indentation Vincent Breitmoser 2014-06-06 16:14:15 +02:00
• 9d02bc85e2 Fix compile error introduced during merge mar-v-in 2014-06-06 00:51:24 +02:00
• e2164f571e Merge branch 'master' into automatic-contact-discovery mar-v-in 2014-06-05 23:56:29 +02:00
• 36312b950a Add dnsjava as submodule mar-v-in 2014-06-05 23:46:14 +02:00
• 80e9998640 Show keys with android contacts mar-v-in 2014-06-05 23:22:21 +02:00
• 255462def4 Merge pull request #646 from timbray/master Dominik Schürmann 2014-06-05 21:02:19 +02:00
• 5466adee41 Clean up keyimport.ImportKeysListEntry Tim Bray 2014-06-05 11:56:38 -07:00
• fc3a692002 Merge pull request #645 from timbray/master Dominik Schürmann 2014-06-05 18:16:29 +02:00
• 7811970218 Don't show full fingerprint in key search results Tim Bray 2014-06-05 08:51:55 -07:00
• c84a1ecfff import-log: add parcelable prototype Vincent Breitmoser 2014-06-05 14:06:07 +02:00
• dc1e26f39c Make keylist case insensitive mar-v-in 2014-06-05 00:59:39 +02:00
• 5ab0d76c69 ui: do show Certify identities button even for secret keys Vincent Breitmoser 2014-06-04 21:38:13 +02:00
• 36bc0ae676 fix bug with bad verifying master keys Vincent Breitmoser 2014-06-04 21:35:13 +02:00
• 2946d442e5 do respect expectedFingerprint during key import Vincent Breitmoser 2014-06-04 21:35:03 +02:00
• cae0071342 Merge branch 'master' into automatic-contact-discovery mar-v-in 2014-06-04 21:32:37 +02:00
• cc1e4dce0a neatness refactoring Vincent Breitmoser 2014-06-04 20:27:25 +02:00
• 6a63746278 Fix regex for hkp parsing to support multiple uids mar-v-in 2014-06-04 18:07:28 +02:00
• dd959876f4 First version of automatic contact discovery. mar-v-in 2014-06-04 17:55:24 +02:00
• cc2ef0c17c Store expired state within ImportKeysListEntry mar-v-in 2014-06-04 17:05:57 +02:00
• 54b7b0e522 fixed error message Tim Bray 2014-06-03 11:30:22 -07:00
• 52f1f30846 Use fixed gradle versions Dominik Schürmann 2014-06-04 10:22:05 +02:00
• 6cb791d567 Use fixed gradle versions Dominik Schürmann 2014-06-04 10:21:28 +02:00
• 84d03dd514 Merge pull request #643 from open-keychain/v/dev Dominik Schürmann 2014-06-03 13:06:49 +02:00
• 4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite Vincent Breitmoser 2014-06-02 18:49:24 +02:00
• 80779defb1 spongycastle: expose pskr constructor Vincent Breitmoser 2014-06-02 18:48:46 +02:00
• 58edc0af67 wrapped-key-ring: add documentation Vincent Breitmoser 2014-05-31 13:10:41 +02:00
• d891f75339 make everything work again Vincent Breitmoser 2014-05-31 12:58:35 +02:00
• e27048fe73 wrapped-key-ring: move key data around in ParcelableKeyRing instead of ImportKeysListEntry Vincent Breitmoser 2014-05-30 17:11:54 +02:00
• ed8b62c32b wrapped-key-ring: no UncachedSecretKeyRing after all Vincent Breitmoser 2014-05-28 21:52:45 +02:00
• 39997a802e Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-05-31 20:54:30 +02:00
• 6d1369be56 Pull from transifex Dominik Schürmann 2014-05-31 20:49:56 +02:00
• 34b97cb136 Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS mar-v-in 2014-05-29 11:43:41 +02:00
• d4cdc36448 Merge branch 'hkps-support' into automatic-contact-discovery mar-v-in 2014-05-29 11:33:53 +02:00
• 3417a7a2de Store nice origin with keybase keys (that can't be interpreted as HKP server) mar-v-in 2014-05-29 10:34:50 +02:00
• 518f3e1763 Make abstract methods in Keyserver public (implementations make them public anyway) mar-v-in 2014-05-29 10:33:15 +02:00
• be490307f9 Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS mar-v-in 2014-05-29 10:24:00 +02:00
• c676e53479 Fix url building to support certificate check on hkps servers mar-v-in 2014-05-28 20:44:01 +02:00
• cb92c9ccc8 Add hkps support mar-v-in 2014-05-27 21:16:52 +02:00
• 8e5767f967 Store origin with ImportKeysListEntry mar-v-in 2014-05-27 20:17:49 +02:00
• 3110122a85 Add ability to resolve HkpKeyserver from _hkp._tcp SRV record mar-v-in 2014-05-27 19:45:58 +02:00
• a53da491c0 new savekeyring operation (mostly stub) Vincent Breitmoser 2014-05-14 15:37:55 +02:00
• 6415290b2d introduce new SaveKeyringParcel Vincent Breitmoser 2014-05-09 15:30:14 +02:00
• ce1c3d1a1e rename SaveKeyringParcel to OldSaveKeyringParcel Vincent Breitmoser 2014-05-09 14:06:23 +02:00
• e7fa124108 update unit test support in build files Vincent Breitmoser 2014-05-12 22:18:11 +02:00
• 4a6aaf1e83 fix missing userIds in ImportKeysListEntry Vincent Breitmoser 2014-05-27 13:49:39 +02:00
• 7865b92285 ContactHelper can read email addresses from contact list mar-v-in 2014-05-26 20:24:13 +02:00
• 13d4a6d902 Merge pull request #632 from timbray/master Dominik Schürmann 2014-05-25 13:55:29 +02:00
• 58da3d12b0 Finished cleaning up rebase conflicts post Keyserver exception refactor Tim Bray 2014-05-23 09:42:32 -07:00
• 1ff3962acc Add Log.d for QueryFailedException Tim Bray 2014-05-22 17:04:31 -07:00
• dfd5aa65a5 Add Log.d for QueryFailedException Tim Bray 2014-05-22 16:56:28 -07:00
• 97af8b2a01 wrapped-key-ring: forgot a part in PgpDecryptVerify Vincent Breitmoser 2014-05-23 17:04:15 +02:00
• c107fc668f introduce WrappedSignature for the ViewCert* ui code Vincent Breitmoser 2014-05-23 16:48:41 +02:00
• 91a8a6c2d1 wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoader Vincent Breitmoser 2014-05-23 16:48:03 +02:00
• 10ad7be46b wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type Vincent Breitmoser 2014-05-23 16:44:50 +02:00
• cd0aba9d43 wrapped-key-ring: encapsulate key flags Vincent Breitmoser 2014-05-22 13:05:02 +02:00