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

Commit graph

  • 8981fcf93d fix one log level Vincent Breitmoser 2014-08-30 17:22:20 +02:00
  • 07ecd38842 get rid of a deprecated method use Vincent Breitmoser 2014-08-30 17:12:08 +02:00
  • b6203a2b3c Merge remote-tracking branch 'dakid/master' Vincent Breitmoser 2014-08-30 17:03:47 +02:00
  • 5ff3043903 canonicalize: add check for algorithm type Vincent Breitmoser 2014-08-30 17:00:58 +02:00
  • c7c2ccab45 Encrypted message is not being spellchecked anymore Daniel Albert 2014-08-30 16:55:47 +02:00
  • ac080b21ef show bitsizes in import key list again Vincent Breitmoser 2014-08-30 15:45:36 +02:00
  • 456aa00e2a Update TokenAutoComplete Dominik Schürmann 2014-08-29 18:49:55 +02:00
  • 8f37b22adb Fix possible nullpointer in Preferences Dominik Schürmann 2014-08-29 18:39:15 +02:00
  • 880aea53c9 Mardown compatible changelog Dominik Schürmann 2014-08-28 13:12:44 +02:00
  • 677d9e6023 Fix crash in PgpKeyHelper Dominik Schürmann 2014-08-28 13:10:52 +02:00
  • aeb0296572 Update nfc lib Dominik Schürmann 2014-08-28 11:05:52 +02:00
  • c0ebc92611 Merge branch 'master' into yubikey Dominik Schürmann 2014-08-28 11:00:18 +02:00
  • b193965e58 Merge pull request #796 from open-keychain/develop Dominik Schürmann 2014-08-28 10:46:58 +02:00
  • 4aeacd5b51 Fix NullPointerException in ImportKeysActivity Dominik Schürmann 2014-08-28 10:40:11 +02:00
  • 9288e4f0a9 Fix RuntimeException in KeyListActivity on tablets Dominik Schürmann 2014-08-28 10:37:01 +02:00
  • 33e219242c Travis should use gradle wrapper script Dominik Schürmann 2014-08-28 00:51:45 +02:00
  • 6d9a18941b v2.8 Dominik Schürmann 2014-08-27 19:29:17 +02:00
  • c2f6aa09c5 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-27 19:28:46 +02:00
  • d795f8d4e2 Strip out duplicate user ids Dominik Schürmann 2014-08-27 19:28:33 +02:00
  • cb2eb8aca2 small language fixes for previous commit Vincent Breitmoser 2014-08-27 15:42:09 +02:00
  • 12a5b2174f Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696 Dominik Schürmann 2014-08-27 14:12:59 +02:00
  • 86a05033ae Cleanup FoldableLinearLayout Dominik Schürmann 2014-08-27 13:54:33 +02:00
  • 5ddbbb76be Function graphic Dominik Schürmann 2014-08-26 08:50:44 +02:00
  • 783dae8804 add ecc support Vincent Breitmoser 2014-08-24 05:12:09 +02:00
  • 88d7e46d6f Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-23 15:27:35 +02:00
  • 71657d993c API: Fix re-seletion of keys on default account Dominik Schürmann 2014-08-23 15:27:25 +02:00
  • 9f9c31868d tests: fix non-deterministic testMasterModify Vincent Breitmoser 2014-08-23 12:13:28 +02:00
  • 08bdb0c5b9 update to tidy spongy-master Vincent Breitmoser 2014-08-23 11:57:19 +02:00
  • 79c4d3ea49 Pull from transifex Dominik Schürmann 2014-08-22 09:54:01 +02:00
  • 77c7eb9096 v2.8 beta4 Dominik Schürmann 2014-08-22 09:01:57 +02:00
  • 3d6f5e8ba1 Fix contact sync Dominik Schürmann 2014-08-22 09:01:37 +02:00
  • 152cd10b70 Revert "No need for setSyncAutomatically, this is only for network tickles" Dominik Schürmann 2014-08-22 08:53:16 +02:00
  • 3acbe9052f Add ECDH and ECDSA values Dominik Schürmann 2014-08-21 15:40:09 +02:00
  • aa35f6cffb Fixing build with Spongy Castle 1.51 Dominik Schürmann 2014-08-21 15:20:49 +02:00
  • 602fd546f7 Update spongy castle, not building... Dominik Schürmann 2014-08-21 15:12:25 +02:00
  • 7adff7c7df Add info about device with intent chooser bug Dominik Schürmann 2014-08-21 14:41:32 +02:00
  • da072ef69c 2.8 beta3 Dominik Schürmann 2014-08-21 14:08:01 +02:00
  • b7de91ad51 Disable custom intent chooser Dominik Schürmann 2014-08-21 14:07:37 +02:00
  • acff54d7d7 2.8 beta2 Dominik Schürmann 2014-08-21 11:44:55 +02:00
  • 562e379c56 Fix nullpointer when revoking keys Dominik Schürmann 2014-08-21 11:40:48 +02:00
  • 3c46c3c2df Add account only on jelly bean and above Dominik Schürmann 2014-08-21 11:36:47 +02:00
  • 0c1e65bc8b No need for setSyncAutomatically, this is only for network tickles Dominik Schürmann 2014-08-21 11:33:42 +02:00
  • f0ff8d2222 Add sync properties Dominik Schürmann 2014-08-21 11:25:41 +02:00
  • 2930f83b2a Change account type Dominik Schürmann 2014-08-21 11:19:44 +02:00
  • 7adf07a9f9 XML cleanup Dominik Schürmann 2014-08-21 10:47:29 +02:00
  • e1d60c698c v2.8 beta1 Dominik Schürmann 2014-08-21 00:46:30 +02:00
  • 41052d6f8f Pull from transifex Dominik Schürmann 2014-08-21 00:36:15 +02:00
  • 4c6783215f cleanup Dominik Schürmann 2014-08-21 00:33:52 +02:00
  • d1ef355f55 Fix result handling in account settings Dominik Schürmann 2014-08-21 00:29:49 +02:00
  • ad9339b23d Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-08-21 00:02:33 +02:00
  • 63ca81d871 Copyright (C) 2014 Vincent Breitmoser Vincent Breitmoser 2014-08-21 00:02:27 +02:00
  • 3ace5052e7 Comment extra in requestSync Dominik Schürmann 2014-08-20 23:56:17 +02:00
  • 6e3af6605a Sync in KeychainIntentService on delete, import, save Dominik Schürmann 2014-08-20 23:55:01 +02:00
  • 642a63fab6 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-20 23:26:09 +02:00
  • 418e922c78 Enable sync adapter, changelog Dominik Schürmann 2014-08-20 23:26:01 +02:00
  • 0b07c5258f Disable key import in sync adapter Dominik Schürmann 2014-08-20 23:13:37 +02:00
  • ce4bfdf945 Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-08-20 23:09:25 +02:00
  • 9c9fc5330a small change to make android studio recognize a honeycomb-only block Vincent Breitmoser 2014-08-20 23:09:20 +02:00
  • dcf268bcb2 move key deletion into KeychainIntentHandler Vincent Breitmoser 2014-08-20 23:08:52 +02:00
  • e8bc9083f2 improve certs_text Dominik Schürmann 2014-08-20 23:01:27 +02:00
  • 37caddca70 Upload key working Dominik Schürmann 2014-08-20 22:51:00 +02:00
  • 945764b30f Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-08-20 22:38:28 +02:00
  • 0f8958afb9 Upload key working Dominik Schürmann 2014-08-20 22:17:16 +02:00
  • dd1b27b28f consolidate: small ui things Vincent Breitmoser 2014-08-20 21:52:54 +02:00
  • 6c428fa6b5 make number of secret keys imported part of ImportResult parcel Vincent Breitmoser 2014-08-20 21:51:57 +02:00
  • 9122d43d0a close actionmode in keylist on loading events (avoid inconsistent state) Vincent Breitmoser 2014-08-20 21:51:19 +02:00
  • fa25265e79 Fix key sharing Dominik Schürmann 2014-08-20 21:51:01 +02:00
  • e33e5b0003 Work on upload key Dominik Schürmann 2014-08-20 21:44:51 +02:00
  • 6ed0f667cd consolidate: remove debug "breakpoint" Vincent Breitmoser 2014-08-20 21:29:11 +02:00
  • 45706e6534 Notify duration, cleanup Dominik Schürmann 2014-08-20 21:09:46 +02:00
  • 937c91eefa Fix nullpointer in first time activity Dominik Schürmann 2014-08-20 20:44:49 +02:00
  • ccc1d2e006 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-20 20:24:24 +02:00
  • 735040e193 return some more results Dominik Schürmann 2014-08-20 20:24:19 +02:00
  • 2cc265390c Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-08-20 20:16:05 +02:00
  • c296529049 modifyKey: small logging changes Vincent Breitmoser 2014-08-20 20:15:43 +02:00
  • 50c33ef322 progress dialog design fix Dominik Schürmann 2014-08-20 20:13:25 +02:00
  • e13c3bd1ac Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-20 20:08:56 +02:00
  • 47bcc6149e return some more results Dominik Schürmann 2014-08-20 20:08:51 +02:00
  • 1e5ac82985 Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-08-20 19:59:54 +02:00
  • 475293a116 consolidate: prevent concurrent calls of step 2 Vincent Breitmoser 2014-08-20 19:59:45 +02:00
  • 0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-20 19:48:19 +02:00
  • f46f2b6895 Fixes and temporary fixes for returning results Dominik Schürmann 2014-08-20 19:46:44 +02:00
  • 2a96912a96 Merge branch 'master' of github.com:open-keychain/open-keychain Vincent Breitmoser 2014-08-20 19:34:42 +02:00
  • fe1f5489ff consolidate: implement (mostly) recovery mode Vincent Breitmoser 2014-08-20 19:34:36 +02:00
  • 9aaaac068e consolidate: use KeychainProvider for deletion operation Vincent Breitmoser 2014-08-20 19:31:51 +02:00
  • c3b12bb3c2 Pull from transifex Dominik Schürmann 2014-08-20 18:30:22 +02:00
  • 70426041df Pull from transifex Dominik Schürmann 2014-08-20 11:09:41 +02:00
  • d6d68622ce Travis is now stable Dominik Schürmann 2014-08-20 11:03:56 +02:00
  • c00d619099 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-20 09:20:55 +02:00
  • d26c6b1a08 Update keybase lib Dominik Schürmann 2014-08-20 09:20:30 +02:00
  • c86ef06a24 Merge pull request #782 from mar-v-in/issue-781 Dominik Schürmann 2014-08-19 23:42:42 +02:00
  • 1a6734f29c Fix mime types, #781 mar-v-in 2014-08-19 18:54:48 +02:00
  • 16ab761006 Fix strings Dominik Schürmann 2014-08-19 18:12:19 +02:00
  • 9930ab7f6f consolidate: a lot more log output, better recovery Vincent Breitmoser 2014-08-19 16:53:44 +02:00
  • c42f6a04ed Start consolidate activity Dominik Schürmann 2014-08-19 16:49:48 +02:00
  • 4f8ddad9d3 ConsolidateDialogActivity Dominik Schürmann 2014-08-19 16:40:57 +02:00
  • 4be8c36b43 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-08-19 16:31:59 +02:00
  • 5f8bbab569 Scroll fixes for certify activity Dominik Schürmann 2014-08-19 16:31:51 +02:00
  • 9fb1050fed stub for consolidate recovery in KeychainApplication Vincent Breitmoser 2014-08-19 15:56:53 +02:00
  • 0422d48b61 add ProgressFixedScaler (forgot in a previous commit) Vincent Breitmoser 2014-08-19 15:55:53 +02:00