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

Commit graph

  • 97ecf25cb4 Merge pull request #531 from danielhass/toast_replacement Dominik Schürmann 2014-04-07 14:06:35 +02:00
  • ddd0111704 Futher Toast replacements in CertifyKeyActivity Daniel Haß 2014-04-07 10:48:57 +02:00
  • 3c8be8bf85 Merge pull request #529 from gogowitczak/gradlebug-branch Dominik Schürmann 2014-04-06 21:33:38 +02:00
  • f89ab48d61 Fixed gradle localTest bug on Windows. gogowitczak 2014-04-06 21:25:46 +02:00
  • 191dcf0c31 Comment out localTest due to bug on windows Dominik Schürmann 2014-04-06 20:52:44 +02:00
  • 834eb41932 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-04-06 17:40:16 +02:00
  • 454b9baf11 License clarification in README Dominik Schürmann 2014-04-06 17:39:56 +02:00
  • eb86021234 Merge pull request #522 from Valodim/master Dominik Schürmann 2014-04-06 17:11:07 +02:00
  • b4e7d69b35 show key expiry status similar to revocation Vincent Breitmoser 2014-04-06 16:09:39 +02:00
  • c3bb2b9d34 Update README Dominik Schürmann 2014-04-06 14:50:49 +02:00
  • 5c19193ca2 Update travis link Dominik Schürmann 2014-04-06 14:46:43 +02:00
  • fbb872c136 Update transifex config Dominik Schürmann 2014-04-06 13:14:11 +02:00
  • 2a9ecb845d Update README Dominik Schürmann 2014-04-06 13:06:12 +02:00
  • 6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain Dominik Schürmann 2014-04-06 12:57:42 +02:00
  • 17997dd362 Pull from transifex Dominik Schürmann 2014-04-06 12:51:46 +02:00
  • d3d36485d5 Optimize comments, remove dead code Dominik Schürmann 2014-04-06 11:55:41 +02:00
  • 56cd3ab9c7 Use dark icon in warning dialogs in edit key Dominik Schürmann 2014-04-06 11:48:31 +02:00
  • f7b1d84dd9 code style Dominik Schürmann 2014-04-06 11:39:58 +02:00
  • a9172e809f copyright header correction, style fixes Dominik Schürmann 2014-04-06 11:30:01 +02:00
  • a234d09f91 Merge pull request #520 from Valodim/certs Dominik Schürmann 2014-04-06 11:23:30 +02:00
  • d5842940b5 certs: remove unused menu item Vincent Breitmoser 2014-04-06 05:34:34 +02:00
  • 8b6c31ba46 certs: change migration routine so certifications work Vincent Breitmoser 2014-04-06 05:29:46 +02:00
  • bd8dc05b1c certs: display green dot for certified keys in KeyListFragment Vincent Breitmoser 2014-04-06 05:29:19 +02:00
  • 194fc7507b certs: forgot to add ids file Vincent Breitmoser 2014-04-06 05:07:14 +02:00
  • d1b0d0fa5e Merge remote-tracking branch 'origin/master' into certs Vincent Breitmoser 2014-04-06 04:35:05 +02:00
  • 456a634149 certs: ditch expiry, re-add data blob, improve ViewCertActivity Vincent Breitmoser 2014-04-06 04:27:55 +02:00
  • f01a96f56e certs: fix ViewCertActivity Vincent Breitmoser 2014-04-06 03:15:59 +02:00
  • 6e2b21b6b7 certs: fix CertifyKeyActivity and improve user id list Vincent Breitmoser 2014-04-06 02:27:21 +02:00
  • 120e1eada7 certs: ditch selection spinner from certs view Vincent Breitmoser 2014-04-06 01:57:28 +02:00
  • 84857df703 certs: display cert type in cert view Vincent Breitmoser 2014-04-06 01:25:52 +02:00
  • ed3798be8a certs: display uid status in uid list Vincent Breitmoser 2014-04-06 01:11:57 +02:00
  • 437da180fc certs: properly handle primary flag and revocation of uids Vincent Breitmoser 2014-04-06 00:58:11 +02:00
  • 22a6bfb985 Use AppMsg in edit key Dominik Schürmann 2014-04-05 23:43:07 +02:00
  • d0c6971273 Remove import activity from drawer, make it reachable from key list only Dominik Schürmann 2014-04-05 23:40:11 +02:00
  • 49bf040dae Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragment Dominik Schürmann 2014-04-05 23:23:36 +02:00
  • 8ce837dbe4 Rework menu items Dominik Schürmann 2014-04-05 23:07:49 +02:00
  • 5af4f6b63f Fix nfc, make edit activity like a modal dialog, move all menu actions into view activity Dominik Schürmann 2014-04-05 22:55:32 +02:00
  • 1b1304e6e0 certs: various improvements Vincent Breitmoser 2014-04-05 22:35:27 +02:00
  • 2802718efb certs: more fixes, almost working now Vincent Breitmoser 2014-04-05 21:38:03 +02:00
  • aa6f5118f5 Merge remote-tracking branch 'origin/master' into certs Vincent Breitmoser 2014-04-05 19:30:52 +02:00
  • db25433890 Change headers in encrypt activity to be more descriptive Dominik Schürmann 2014-04-04 19:54:36 +02:00
  • 72ade58a7a Merge pull request #513 from Valodim/db-overhaul Dominik Schürmann 2014-04-04 19:36:52 +02:00
  • 54f20e1cd5 Merge remote-tracking branch 'origin/master' into db-overhaul Vincent Breitmoser 2014-04-04 18:50:20 +02:00
  • d7c2488a0f db-overhaul: fix key export (and some export-related ui changes) Vincent Breitmoser 2014-04-04 18:49:45 +02:00
  • e65de650a4 Merge pull request #512 from thi/simplify-passphrase-dialog-creation Dominik Schürmann 2014-04-04 18:31:28 +02:00
  • a523f53a96 Simplify PassphraseDialogFragment usage Thialfihar 2014-04-02 20:53:34 +02:00
  • cf76a8553a db-overhaul: fix delete key from ViewKeyActivity Vincent Breitmoser 2014-04-04 16:28:28 +02:00
  • 53e8afaee0 ViewKeyMainFragment cleanup (don't use inline queries!) Vincent Breitmoser 2014-04-04 14:37:07 +02:00
  • 958eba1c95 db-overhaul: fix DecryptAndVerify with and without known keys Vincent Breitmoser 2014-04-04 13:58:12 +02:00
  • 085ce11d9c db-overhaul: workaround api level 11 Vincent Breitmoser 2014-04-04 11:39:34 +02:00
  • 1b38a5b2e3 Merge remote-tracking branch 'origin/master' into db-overhaul Vincent Breitmoser 2014-04-04 13:18:43 +02:00
  • a9f868a5e7 db-overhaul: different hack for type info (api level problem inside) Vincent Breitmoser 2014-04-04 11:39:23 +02:00
  • a1e13f7893 calculate nfc packet on demand only Vincent Breitmoser 2014-04-04 11:38:59 +02:00
  • 2227705d65 db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity Vincent Breitmoser 2014-04-04 05:01:35 +02:00
  • d921cca913 db-overhaul: reintroduce by-mail and by-subkey queries Vincent Breitmoser 2014-04-04 01:07:09 +02:00
  • 59f4b4e3e7 db-overhaul: minor stuff, mostly ProviderHelper Vincent Breitmoser 2014-04-04 01:04:28 +02:00
  • 2620e0bfc8 db-overhaul: more work on new provider Vincent Breitmoser 2014-04-03 22:49:08 +02:00
  • dedcfd8a72 more work on streamlining uris, and stripping ProviderHelper Vincent Breitmoser 2014-04-03 17:09:26 +02:00
  • 428e94bb57 ditch useless PgpKeyHelper.getMasterKey methods Vincent Breitmoser 2014-04-03 17:08:04 +02:00
  • b06f142c50 title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN Dominik Schürmann 2014-04-03 16:51:34 +02:00
  • 97e0b8d0c3 Callback for OpenPgpServiceConnection Dominik Schürmann 2014-04-03 16:36:55 +02:00
  • 0657f9289a simplify OpenPgpServiceConnection Dominik Schürmann 2014-04-03 16:27:13 +02:00
  • 24454b9d88 Keychain API Demo 3 Dominik Schürmann 2014-04-03 16:03:15 +02:00
  • 270c7ffa1f Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into Valodim-db-overhaul Dominik Schürmann 2014-04-03 15:45:21 +02:00
  • 098823bd52 Disable tests Dominik Schürmann 2014-04-03 15:26:51 +02:00
  • 40e3b9cf79 version 2.5 Dominik Schürmann 2014-04-03 15:21:34 +02:00
  • 3b91147b49 Update from transifex Dominik Schürmann 2014-04-03 15:21:14 +02:00
  • c3091c2b5d Changelog Dominik Schürmann 2014-04-03 15:19:49 +02:00
  • 04b0425d45 Key lookup for API Dominik Schürmann 2014-04-03 15:18:05 +02:00
  • 09411a62fa Key lookup for API Dominik Schürmann 2014-04-03 15:16:13 +02:00
  • 2df4ccafb5 Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN Dominik Schürmann 2014-04-03 15:02:55 +02:00
  • 34fca975d7 Merge remote-tracking branch 'origin/master' into db-overhaul Vincent Breitmoser 2014-04-03 13:43:28 +02:00
  • 11b08c4d98 Cleanup DrawerActivity Dominik Schürmann 2014-04-03 12:28:30 +02:00
  • 0b24ec04a6 clarify readme Dominik Schürmann 2014-04-03 12:14:58 +02:00
  • a7eff41ced Break a lot of stuff. Also, database redesign. Vincent Breitmoser 2014-04-03 01:34:35 +02:00
  • 34ad14ccec Merge pull request #508 from thi/naming-adjustments Dominik Schürmann 2014-04-02 20:29:26 +02:00
  • 7a66ccb5ee Rename "canEdit" to "canBeEdited" Thialfihar 2014-04-02 15:43:29 +02:00
  • c4c9713da4 Rename "armour" to "armor" Thialfihar 2014-04-02 15:36:32 +02:00
  • 6ac13d9f69 Rename "pass phrase" to "passphrase" Thialfihar 2014-04-02 15:31:03 +02:00
  • 62bd817f86 Cleanup example code Dominik Schürmann 2014-04-02 15:19:51 +02:00
  • 26837f2a80 Started changelog for 2.5 Dominik Schürmann 2014-04-02 14:00:46 +02:00
  • fc29fadd51 Fix build Dominik Schürmann 2014-04-02 13:54:38 +02:00
  • 846b379eb2 Merge pull request #507 from thi/fix-wildcard-imports Dominik Schürmann 2014-04-02 13:41:15 +02:00
  • c45c0f4a92 Add wildcard import warning to checkstyle configuration Thialfihar 2014-04-02 13:35:16 +02:00
  • 77a6c509f7 Replace wildcard imports with explicit imports Thialfihar 2014-04-02 13:34:42 +02:00
  • a3a5085afb Spacing corrections Thialfihar 2014-04-02 13:21:11 +02:00
  • 269f7feb89 Update from transifex Dominik Schürmann 2014-04-02 11:48:05 +02:00
  • 64358bb3f8 Merge pull request #502 from thi/conform-to-style-guide Dominik Schürmann 2014-04-02 11:26:46 +02:00
  • 22fe3832ba Suppress checkstyle for some files Thialfihar 2014-04-02 01:58:54 +02:00
  • 592ab31d86 Add missing and curly brackets and fix others Thialfihar 2014-04-02 01:58:31 +02:00
  • 82e5d14fb1 Rearrange too long lines Thialfihar 2014-04-02 01:56:58 +02:00
  • d5983b324f Adjust variable/member naming to conform to style guide Thialfihar 2014-04-02 01:51:02 +02:00
  • dd4a1e3f52 Trivial spacing changes to conform to style guide Thialfihar 2014-04-02 01:43:40 +02:00
  • 8e503bd263 Adjust copyright headers Thialfihar 2014-04-02 01:36:13 +02:00
  • e92658f44d Adjust import order Thialfihar 2014-04-02 01:34:24 +02:00
  • 5583fd513e always ask Ashley Hughes 2014-04-02 01:28:53 +01:00
  • 9764d3fcb9 confirm that empty IDs are really wanted Ashley Hughes 2014-04-02 01:26:51 +01:00
  • a38d22757c new ID sigs already added, so do save them Ashley Hughes 2014-04-02 00:08:36 +01:00
  • 6d4a09f989 allow blank IDs, allow adding new IDs and let them be master Ashley Hughes 2014-04-02 00:00:24 +01:00
  • 2ad616ed3f pass through info that keys are new without relying on new keys orginally being empty Ashley Hughes 2014-04-01 23:37:13 +01:00