cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,737 Commits 1 Branch 0 Tags
094fb698deca4aa269a754e89acacde2f339a97f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 094fb698de Refactor ProviderHelper to be non-static using a constructor based on context (first commit to get context out of pgp classes) 2014-04-11 17:45:52 +02:00
Dominik Schürmann bbd97cf800 Remove queries from PgpKeyHelper, introduce encrypt to signer mode (not tested) 2014-04-11 17:14:37 +02:00
Dominik Schürmann a9281b129c Prettify view_key_userids_item 2014-04-11 16:09:51 +02:00
Dominik Schürmann b5c16e2446 Prettify more layouts 2014-04-11 16:00:37 +02:00
Dominik Schürmann 85bb3d9480 Merge pull request #553 from Valodim/split-masterKeyId 
Split master key & partial fix for uid order
 2014-04-11 14:39:35 +02:00
Dominik Schürmann 31e8926d6f Merge pull request #550 from Valodim/select-fragment 
Select*KeyFragment rewrites
 2014-04-10 19:16:46 +02:00
Dominik Schürmann a63488cce3 Disable selection of user ids and keys in view key 2014-04-10 14:14:32 +02:00
Dominik Schürmann a85b217756 Minimize use of class variables in ViewKey 2014-04-10 13:58:19 +02:00
Dominik Schürmann da4016d565 Cleanup AsyncTask code for NFC 2014-04-10 13:53:02 +02:00
Dominik Schürmann b3a39d7c24 Cleanup imports 2014-04-10 13:48:44 +02:00
Dominik Schürmann 8ee7dbfdb0 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-10 13:48:05 +02:00
Dominik Schürmann 2ac8be2858 Integrate NFC functionality into ViewKeyActivity 2014-04-10 13:47:58 +02:00
Dominik Schürmann 8fcb0cf98d Merge pull request #545 from danielhass/toast_replacement 
Toast replacement
 2014-04-10 11:26:53 +02:00
Dominik Schürmann eba0640d3e Prettify more layouts, fix edit and encrypt intents from key view 2014-04-09 20:10:23 +02:00
Dominik Schürmann 6d00ca7fdb Temporary disable of master key id extraction from uri 2014-04-09 19:57:57 +02:00
Dominik Schürmann 21e6110b6d Prettify some layouts 2014-04-09 19:42:27 +02:00
Dominik Schürmann 9c41477a4d Fix gitignore for lint 2014-04-09 16:36:28 +02:00
Dominik Schürmann 30652a470f Fix certification layout 2014-04-09 16:35:27 +02:00
Dominik Schürmann 19b62d67b3 Fix NFC 2014-04-09 16:05:47 +02:00
Dominik Schürmann a0a51c9f92 Fix save keyring, improve signature verification 2014-04-09 15:39:50 +02:00
Dominik Schürmann 27eb7c0f1b Cleanup in SelectKeyCursorAdapter 2014-04-09 01:11:33 +02:00
Dominik Schürmann 9fb493418e Hide keyboard after hiding custom key length field 2014-04-09 00:58:24 +02:00
Dominik Schürmann e9efd0ec87 Merge pull request #539 from gogowitczak/custom-key-length-info 
Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions.
 2014-04-09 00:51:58 +02:00
Dominik Schürmann b682cb2ae5 KeychainIntentService instead of APG 2014-04-09 00:09:47 +02:00
Dominik Schürmann 8680b5b08e Fix DECRYPT and SEND intent 2014-04-09 00:05:16 +02:00
Dominik Schürmann 8ab9a0a2d0 Use NotFoundException in more places 2014-04-08 23:41:21 +02:00
Dominik Schürmann d81de8509b Fix decryption of messages/files encrypted for multiple public keys 2014-04-08 23:01:38 +02:00
Dominik Schürmann a1efb24228 Introduce ProviderHelper.NotFoundException, remove dead code 2014-04-08 22:25:42 +02:00
Dominik Schürmann 946c1e115c Merge pull request #537 from thi/change-license-to-gpl 
Change license to gpl
 2014-04-08 12:29:08 +02:00
Dominik Schürmann 02549bd439 Merge pull request #536 from gogowitczak/custom-key-length 
Added possibility to enter custom key length.
 2014-04-08 10:00:53 +02:00
Dominik Schürmann 97ecf25cb4 Merge pull request #531 from danielhass/toast_replacement 
Futher Toast replacements
 2014-04-07 14:06:35 +02:00
Dominik Schürmann 3c8be8bf85 Merge pull request #529 from gogowitczak/gradlebug-branch 
Fixed gradle localTest bug on Windows.
 2014-04-06 21:33:38 +02:00
Dominik Schürmann 191dcf0c31 Comment out localTest due to bug on windows 2014-04-06 20:52:44 +02:00
Dominik Schürmann 834eb41932 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-06 17:40:16 +02:00
Dominik Schürmann 454b9baf11 License clarification in README 2014-04-06 17:39:56 +02:00
Dominik Schürmann eb86021234 Merge pull request #522 from Valodim/master 
show key expiry status similar to revocation
 2014-04-06 17:11:07 +02:00
Dominik Schürmann c3bb2b9d34 Update README 2014-04-06 14:50:49 +02:00
Dominik Schürmann 5c19193ca2 Update travis link 2014-04-06 14:46:43 +02:00
Dominik Schürmann fbb872c136 Update transifex config 2014-04-06 13:14:11 +02:00
Dominik Schürmann 2a9ecb845d Update README 2014-04-06 13:06:12 +02:00
Dominik Schürmann 6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00
Dominik Schürmann 17997dd362 Pull from transifex 2014-04-06 12:51:46 +02:00
Dominik Schürmann d3d36485d5 Optimize comments, remove dead code 2014-04-06 11:55:41 +02:00
Dominik Schürmann 56cd3ab9c7 Use dark icon in warning dialogs in edit key 2014-04-06 11:48:31 +02:00
Dominik Schürmann f7b1d84dd9 code style 2014-04-06 11:39:58 +02:00
Dominik Schürmann a9172e809f copyright header correction, style fixes 2014-04-06 11:30:01 +02:00
Dominik Schürmann a234d09f91 Merge pull request #520 from Valodim/certs 
Certificate support
 2014-04-06 11:23:30 +02:00
Dominik Schürmann 22a6bfb985 Use AppMsg in edit key 2014-04-05 23:43:07 +02:00
Dominik Schürmann d0c6971273 Remove import activity from drawer, make it reachable from key list only 2014-04-05 23:40:11 +02:00
Dominik Schürmann 49bf040dae Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragment 2014-04-05 23:23:36 +02:00
Dominik Schürmann 8ce837dbe4 Rework menu items 2014-04-05 23:07:49 +02:00
Dominik Schürmann 5af4f6b63f Fix nfc, make edit activity like a modal dialog, move all menu actions into view activity 2014-04-05 22:55:32 +02:00
Dominik Schürmann db25433890 Change headers in encrypt activity to be more descriptive 2014-04-04 19:54:36 +02:00
Dominik Schürmann 72ade58a7a Merge pull request #513 from Valodim/db-overhaul 
Get everything working again after db overhaul
 2014-04-04 19:36:52 +02:00
Dominik Schürmann e65de650a4 Merge pull request #512 from thi/simplify-passphrase-dialog-creation 
Simplify passphrase dialog creation
 2014-04-04 18:31:28 +02:00
Dominik Schürmann b06f142c50 title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN 2014-04-03 16:51:34 +02:00
Dominik Schürmann 97e0b8d0c3 Callback for OpenPgpServiceConnection 2014-04-03 16:36:55 +02:00
Dominik Schürmann 0657f9289a simplify OpenPgpServiceConnection 2014-04-03 16:27:13 +02:00
Dominik Schürmann 24454b9d88 Keychain API Demo 3 2014-04-03 16:03:15 +02:00
Dominik Schürmann 270c7ffa1f Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into Valodim-db-overhaul 2014-04-03 15:45:21 +02:00
Dominik Schürmann 098823bd52 Disable tests 2014-04-03 15:26:51 +02:00
Dominik Schürmann 40e3b9cf79 version 2.5 2014-04-03 15:21:34 +02:00
Dominik Schürmann 3b91147b49 Update from transifex 2014-04-03 15:21:14 +02:00
Dominik Schürmann c3091c2b5d Changelog 2014-04-03 15:19:49 +02:00
Dominik Schürmann 04b0425d45 Key lookup for API 2014-04-03 15:18:05 +02:00
Dominik Schürmann 09411a62fa Key lookup for API 2014-04-03 15:16:13 +02:00
Dominik Schürmann 2df4ccafb5 Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN 2014-04-03 15:02:55 +02:00
Dominik Schürmann 11b08c4d98 Cleanup DrawerActivity 2014-04-03 12:28:30 +02:00
Dominik Schürmann 0b24ec04a6 clarify readme 2014-04-03 12:14:58 +02:00
Dominik Schürmann 34ad14ccec Merge pull request #508 from thi/naming-adjustments 
Naming adjustments
 2014-04-02 20:29:26 +02:00
Dominik Schürmann 62bd817f86 Cleanup example code 2014-04-02 15:19:51 +02:00
Dominik Schürmann 26837f2a80 Started changelog for 2.5 2014-04-02 14:00:46 +02:00
Dominik Schürmann fc29fadd51 Fix build 2014-04-02 13:54:38 +02:00
Dominik Schürmann 846b379eb2 Merge pull request #507 from thi/fix-wildcard-imports 
Fix wildcard imports
 2014-04-02 13:41:15 +02:00
Dominik Schürmann 269f7feb89 Update from transifex 2014-04-02 11:48:05 +02:00
Dominik Schürmann 64358bb3f8 Merge pull request #502 from thi/conform-to-style-guide 
Conform to style guide, #466
 2014-04-02 11:26:46 +02:00
Dominik Schürmann d8001f9bbd Menu cleanup 2014-04-01 19:31:57 +02:00
Dominik Schürmann c414dd2fe9 Dont show encrypted data before decryption from clipboard 2014-04-01 19:00:14 +02:00
Dominik Schürmann 07fdd6363f Change path to OpenKeychain 2014-04-01 18:49:19 +02:00
Dominik Schürmann d0947e8377 Only allow private keys associated to accounts of an app 2014-04-01 18:44:36 +02:00
Dominik Schürmann 2c5991b199 Add API image 2014-04-01 17:19:51 +02:00
Dominik Schürmann 2f9cb69a1e Cleanup 2014-04-01 17:13:53 +02:00
Dominik Schürmann ecca54d4d5 Automatically select newly created key in api accounts 2014-04-01 17:08:56 +02:00
Dominik Schürmann ddfb7e10e8 Fully qualified imports 2014-04-01 16:39:18 +02:00
Dominik Schürmann acc2e208cf Remove DECRYPT_ASSUME_SYMMETRIC 2014-04-01 16:18:16 +02:00
Dominik Schürmann 53605855ee Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-04-01 16:15:55 +02:00
Dominik Schürmann 7000ab37fd default to allow symmetric decryption 2014-04-01 16:15:50 +02:00
Dominik Schürmann 247ad6207a Merge pull request #501 from Valodim/master 
factor out android dependencies from PgpKeyOperation, and add JUnit/Robolectric testing stubs
 2014-04-01 16:13:41 +02:00
Dominik Schürmann ebb7f55921 Fix symmetric decryption 2014-04-01 16:08:40 +02:00
Dominik Schürmann fadc08480f Fix pre-selection for encrypt 2014-04-01 15:40:07 +02:00
Dominik Schürmann 19e5a3815a language 2014-04-01 15:36:27 +02:00
Dominik Schürmann ba81869038 More layout fixes 2014-04-01 15:33:56 +02:00
Dominik Schürmann ab8031fb52 More layout fixes 2014-04-01 15:32:14 +02:00
Dominik Schürmann 6e705e5519 Language clarifications 2014-04-01 15:19:12 +02:00
Dominik Schürmann ef562b5e20 Fix layouts 2014-04-01 15:04:54 +02:00
Dominik Schürmann 866d2d28cc Simplify encrypt and sign backend 2014-04-01 14:25:37 +02:00
Dominik Schürmann c859bbb6da Fix symmetric encryption and cleanup 2014-04-01 14:10:32 +02:00
Dominik Schürmann b020f950e1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-04-01 13:31:57 +02:00
Dominik Schürmann 6a617e0bf8 Small layout fix (more to come) 2014-04-01 13:31:49 +02:00
Dominik Schürmann 4c3506f4b1 Experimental work on a fragment-based encrypt activity 2014-04-01 13:25:44 +02:00