cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,684 Commits 1 Branch 0 Tags
834eb41932e87e340c7b4599dcedc5cfe356e167
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann 8f2abf36f8 Layouts for new encrypt design 2014-03-31 20:04:05 +02:00
Dominik Schürmann bb2fb786a8 Include signature result in fragments 2014-03-30 21:33:00 +02:00
Dominik Schürmann 55a2cbe9c3 Decrypt mostly works again 2014-03-30 20:53:16 +02:00
Dominik Schürmann ccce28acdb compiles again 2014-03-30 19:35:35 +02:00
Dominik Schürmann 2947ab7e48 More experimental work on decrypt fragments 2014-03-30 19:32:05 +02:00
Dominik Schürmann 4cec2194e0 Experiments with fragments in decrypt activity 2014-03-30 19:32:04 +02:00
Dominik Schürmann 224e8a7554 Remove cancel from app menu 2014-03-30 19:29:07 +02:00
Dominik Schürmann 583467356c Revert "Remove cancel from app menu" 
This reverts commit 3c0b97f280.
 2014-03-30 19:28:35 +02:00
Dominik Schürmann 3c0b97f280 Remove cancel from app menu 2014-03-30 19:26:41 +02:00
Dominik Schürmann 7b53150ad5 Remove FLAG_ONE_SHOT from most PIs 2014-03-30 19:25:39 +02:00
Dominik Schürmann fc4f9beb6a Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-30 19:18:41 +02:00
Dominik Schürmann e3a7d372a3 Increase API_VERSION to 3 2014-03-30 19:18:18 +02:00
Dominik Schürmann b648d87d76 Parcelable versioning 2014-03-30 19:13:10 +02:00
Dominik Schürmann 6b5d60e1f4 Merge pull request #491 from openpgp-keychain/edit-key 
Edit key changes
 2014-03-30 18:04:43 +02:00
Dominik Schürmann b2342744b5 Actually use fixBadCharactersForGmail 2014-03-30 14:02:09 +02:00
Dominik Schürmann c8defe2e6d Merge pull request #489 from mb-14/clipboard_fp 
Enable importing of fingerprints from clipboard.
 2014-03-27 21:47:33 +01:00
Dominik Schürmann 68668fd444 Version 2.4 2014-03-26 22:56:51 +01:00
Dominik Schürmann 619c079f00 Sync changelog and about with transifex 2014-03-26 22:55:33 +01:00
Dominik Schürmann a589b6e7fe Changelog for 2.4 2014-03-26 22:48:23 +01:00
Dominik Schürmann 8e9ceffae3 Changelog for 2.4 2014-03-26 22:45:35 +01:00
Dominik Schürmann 19bbaecf32 Update from transifex 2014-03-26 22:20:23 +01:00
Dominik Schürmann cc8fd35137 Show divider only when used 2014-03-26 18:34:48 +01:00
Dominik Schürmann ac134790a0 Text for creation of new api accounts 2014-03-26 18:23:48 +01:00
Dominik Schürmann 399106015e Rename layouts for remote activity 2014-03-26 18:18:00 +01:00
Dominik Schürmann aba6a44a0a Improve demo for API accounts 2014-03-26 18:13:48 +01:00
Dominik Schürmann 2e063a42ed Fix provider for API_ACCOUNTS 2014-03-26 17:55:48 +01:00
Dominik Schürmann ba37fc254d Accounts activity prettified 2014-03-26 17:50:16 +01:00
Dominik Schürmann 65857d2b5f Accounts list prettified 2014-03-26 17:43:26 +01:00
Dominik Schürmann de553e9b43 Merge pull request #483 from uberspot/master 
fix capability icons and remove red text for revoked keys
 2014-03-26 14:11:04 +01:00
Dominik Schürmann ec34597331 Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOT 2014-03-26 14:11:28 +01:00
Dominik Schürmann 0d5e99e1f0 Coding style 2014-03-26 13:42:16 +01:00
Dominik Schürmann e5fe4245bf remove old icon entry 2014-03-26 13:39:30 +01:00
Dominik Schürmann b75428daf7 Revert "Update README.md, icon set not used anymore" 
This reverts commit 9d4582f968.
 2014-03-26 13:38:45 +01:00