moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-26 00:48:51 -05:00
Code Issues Releases Wiki Activity
2,927 Commits 12 Branches 24 Tags 116 MiB
a8a1f352a8
Commit Graph

1070 Commits

Author SHA1 Message Date
Dominik Schürmann
f0ff8d2222 Add sync properties 2014-08-21 11:25:41 +02:00
Dominik Schürmann
2930f83b2a Change account type 2014-08-21 11:19:44 +02:00
Dominik Schürmann
7adf07a9f9 XML cleanup 2014-08-21 10:47:29 +02:00
Dominik Schürmann
e1d60c698c v2.8 beta1 2014-08-21 00:46:30 +02:00
Dominik Schürmann
41052d6f8f Pull from transifex 2014-08-21 00:36:15 +02:00
Dominik Schürmann
4c6783215f cleanup 2014-08-21 00:33:52 +02:00
Dominik Schürmann
d1ef355f55 Fix result handling in account settings 2014-08-21 00:29:49 +02:00
Vincent Breitmoser
ad9339b23d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-21 00:02:33 +02:00
Vincent Breitmoser
63ca81d871 Copyright (C) 2014 Vincent Breitmoser 2014-08-21 00:02:27 +02:00
Dominik Schürmann
3ace5052e7 Comment extra in requestSync 2014-08-20 23:56:17 +02:00
Dominik Schürmann
6e3af6605a Sync in KeychainIntentService on delete, import, save 2014-08-20 23:55:01 +02:00
Dominik Schürmann
642a63fab6 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 23:26:09 +02:00
Dominik Schürmann
418e922c78 Enable sync adapter, changelog 2014-08-20 23:26:01 +02:00
Dominik Schürmann
0b07c5258f Disable key import in sync adapter 2014-08-20 23:13:37 +02:00
Vincent Breitmoser
ce4bfdf945 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 23:09:25 +02:00
Vincent Breitmoser
9c9fc5330a small change to make android studio recognize a honeycomb-only block 2014-08-20 23:09:20 +02:00
Vincent Breitmoser
dcf268bcb2 move key deletion into KeychainIntentHandler 2014-08-20 23:08:52 +02:00
Dominik Schürmann
e8bc9083f2 improve certs_text 2014-08-20 23:01:27 +02:00
Dominik Schürmann
37caddca70 Upload key working 2014-08-20 22:51:00 +02:00
Vincent Breitmoser
945764b30f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 22:38:28 +02:00
Dominik Schürmann
0f8958afb9 Upload key working 2014-08-20 22:17:16 +02:00
Vincent Breitmoser
dd1b27b28f consolidate: small ui things 2014-08-20 21:52:54 +02:00
Vincent Breitmoser
6c428fa6b5 make number of secret keys imported part of ImportResult parcel 2014-08-20 21:51:57 +02:00
Vincent Breitmoser
9122d43d0a close actionmode in keylist on loading events (avoid inconsistent state) 2014-08-20 21:51:19 +02:00
Dominik Schürmann
fa25265e79 Fix key sharing 2014-08-20 21:51:01 +02:00
Dominik Schürmann
e33e5b0003 Work on upload key 2014-08-20 21:44:51 +02:00
Vincent Breitmoser
6ed0f667cd consolidate: remove debug "breakpoint" 2014-08-20 21:29:11 +02:00
Dominik Schürmann
45706e6534 Notify duration, cleanup 2014-08-20 21:09:46 +02:00
Dominik Schürmann
937c91eefa Fix nullpointer in first time activity 2014-08-20 20:44:49 +02:00
Dominik Schürmann
ccc1d2e006 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:24:24 +02:00
Dominik Schürmann
735040e193 return some more results 2014-08-20 20:24:19 +02:00
Vincent Breitmoser
2cc265390c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:16:05 +02:00
Vincent Breitmoser
c296529049 modifyKey: small logging changes 2014-08-20 20:15:43 +02:00
Dominik Schürmann
50c33ef322 progress dialog design fix 2014-08-20 20:13:25 +02:00
Dominik Schürmann
e13c3bd1ac Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:08:56 +02:00
Dominik Schürmann
47bcc6149e return some more results 2014-08-20 20:08:51 +02:00
Vincent Breitmoser
1e5ac82985 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 19:59:54 +02:00
Vincent Breitmoser
475293a116 consolidate: prevent concurrent calls of step 2 2014-08-20 19:59:45 +02:00
Dominik Schürmann
0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-08-20 19:48:19 +02:00
Dominik Schürmann
f46f2b6895 Fixes and temporary fixes for returning results 2014-08-20 19:46:44 +02:00
Vincent Breitmoser
2a96912a96 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 19:34:42 +02:00
Vincent Breitmoser
fe1f5489ff consolidate: implement (mostly) recovery mode 2014-08-20 19:34:36 +02:00
Vincent Breitmoser
9aaaac068e consolidate: use KeychainProvider for deletion operation 2014-08-20 19:31:51 +02:00
Dominik Schürmann
c3b12bb3c2 Pull from transifex 2014-08-20 18:30:22 +02:00
Dominik Schürmann
70426041df Pull from transifex 2014-08-20 11:09:41 +02:00
mar-v-in
1a6734f29c Fix mime types, #781 2014-08-19 18:54:48 +02:00
Dominik Schürmann
16ab761006 Fix strings 2014-08-19 18:12:19 +02:00
Vincent Breitmoser
9930ab7f6f consolidate: a lot more log output, better recovery 2014-08-19 16:53:55 +02:00
Dominik Schürmann
c42f6a04ed Start consolidate activity 2014-08-19 16:49:48 +02:00
Dominik Schürmann
4f8ddad9d3 ConsolidateDialogActivity 2014-08-19 16:40:57 +02:00
Dominik Schürmann
4be8c36b43 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-19 16:31:59 +02:00
Dominik Schürmann
5f8bbab569 Scroll fixes for certify activity 2014-08-19 16:31:51 +02:00
Vincent Breitmoser
9fb1050fed stub for consolidate recovery in KeychainApplication 2014-08-19 15:56:53 +02:00
Vincent Breitmoser
0422d48b61 add ProgressFixedScaler (forgot in a previous commit) 2014-08-19 15:55:53 +02:00
Vincent Breitmoser
a2ae318a1a add OpenDialogActivity (stub) 2014-08-19 15:55:40 +02:00
Vincent Breitmoser
c725239a69 consolidate: split into two steps, can pick up at second step if anything fails 2014-08-19 15:45:59 +02:00
Dominik Schürmann
8d668d170c Notes about criticality 2014-08-19 15:23:37 +02:00
Dominik Schürmann
9474749be1 Decrease iteration count, delayed for 2.9 2014-08-19 14:51:28 +02:00
Dominik Schürmann
26e82afa8e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-19 14:46:15 +02:00
Vincent Breitmoser
6a3150d878 fix primary user id in master key flag modification 2014-08-19 14:42:40 +02:00
Dominik Schürmann
c1d05d0ee9 Change criticallity of subpackets after discussion 2014-08-19 14:16:46 +02:00
Dominik Schürmann
4a280f6ba3 Use higher s2k count 2014-08-19 11:11:58 +02:00
Dominik Schürmann
d131693bb8 Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible 2014-08-19 10:58:38 +02:00
Dominik Schürmann
b1bde6ead9 Mark packets critical 2014-08-19 10:42:35 +02:00
Dominik Schürmann
2c8bcffff3 add feature to key sig subpacket to indicate that we want MDC 2014-08-19 10:37:27 +02:00
Dominik Schürmann
a2b3824556 New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering 2014-08-19 10:30:44 +02:00
Dominik Schürmann
6ffdafc0e6 Add license headers 2014-08-19 10:01:39 +02:00
Dominik Schürmann
c1a265bfd1 certs header design 2014-08-19 10:01:31 +02:00
Dominik Schürmann
638c29792d Header for certs view 2014-08-19 09:52:15 +02:00
Dominik Schürmann
a5d34478df Add subkey: at least one flag should be selected! 2014-08-18 11:13:52 +02:00
Dominik Schürmann
3e7ce0008f Fixes for expiry UI 2014-08-18 11:02:41 +02:00
Vincent
56fb822034 Merge pull request #772 from mar-v-in/issue-729 
Remove NoSwipeWrapContentViewPager
 2014-08-17 15:46:27 +02:00
mar-v-in
57b2440731 Work-around rendering bug when switching back to asymmetric with multiple recipients selected 2014-08-17 11:31:41 +02:00
mar-v-in
3cc57a092a Remove NoSwipeWrapContentViewPager 2014-08-17 11:07:34 +02:00
Vincent Breitmoser
14290c3ce9 consolidate: working implementation, lacking ui 2014-08-17 03:29:03 +02:00
Vincent Breitmoser
aa625d4fbf parametrize FileImportCache for filename 2014-08-17 00:49:14 +02:00
Vincent Breitmoser
c00343d516 modify*Key: improve handling of passphrase modification (add tests, too) 2014-08-16 21:04:43 +02:00
Vincent Breitmoser
e38f6a2a46 use correct algorithm for signatures (actually fix heterogeneous subkeys) 2014-08-16 19:45:14 +02:00
Vincent Breitmoser
62b7d2d7d8 fix small log format string mistake for adding subkeys 
closes #768
 2014-08-16 19:31:26 +02:00
Dominik Schürmann
f206902002 Fixing date picker issues 2014-08-16 16:17:46 +02:00
Dominik Schürmann
ccf58a92fa Fix flags UI in add subkey dialog 2014-08-16 13:42:55 +02:00
Dominik Schürmann
c1f9c5e4b5 Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master key 2014-08-16 13:30:13 +02:00
Dominik Schürmann
4d698c896a Fix expiry when adding subkeys 2014-08-16 12:28:49 +02:00
Dominik Schürmann
474fc50b80 Always return a SaveKeyringResult from saving 2014-08-16 12:24:46 +02:00
Dominik Schürmann
188eeb79c9 Fix and simplify in OperationResultParcel 2014-08-16 12:13:30 +02:00
Vincent Breitmoser
2497722b48 fix travis tests (more), minor comment edits 2014-08-16 07:12:37 +02:00
Vincent Breitmoser
7c7ba21714 tests: add test for master key revocation 2014-08-16 07:06:07 +02:00
Vincent Breitmoser
6e84c72801 tests: more expected error types 2014-08-16 06:53:50 +02:00
Vincent Breitmoser
de0d95432e typed expected failures and a couple minor things 2014-08-16 06:53:50 +02:00
Vincent Breitmoser
a943bebfdf support for master key modifications, among other stuff 2014-08-16 06:53:50 +02:00
Vincent Breitmoser
1fa77d57d2 modifySecretKey: err out on "use previous" expiry date for (sub)key creation 2014-08-16 06:53:50 +02:00
Vincent Breitmoser
c54fe21f44 modifySecretKey: err out on revocation of nonexistent user id 2014-08-16 06:53:50 +02:00
Dominik Schürmann
bbe986743c API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables 2014-08-16 05:28:51 +02:00
Dominik Schürmann
443170b876 do not pre-select revoked or expired keys 2014-08-16 04:11:39 +02:00
Dominik Schürmann
8d60d9f103 Fix encrypt only 2014-08-16 03:59:58 +02:00
Dominik Schürmann
b1dc663930 Remove old_apg 2014-08-15 11:07:21 +02:00
Dominik Schürmann
b1fa5d9922 Remove subkeys.pgp.net keyserver from defaults 2014-08-15 11:00:45 +02:00
Dominik Schürmann
2c2860e86d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-15 10:19:51 +02:00
Dominik Schürmann
cf450d24fb Remove subkeys.pgp.net keyserver, often down and no hkps 2014-08-15 10:19:46 +02:00
Vincent Breitmoser
09d37a5fa6 fix keys with no expiry in ui code 2014-08-14 22:12:18 +02:00
Dominik Schürmann
750ced4525 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-14 19:25:43 +02:00
Dominik Schürmann
0f60bcbc3d Pass through of master key id in SaveKeyringResult 2014-08-14 19:25:39 +02:00
Vincent Breitmoser
48935557e8 support changing expiry of subkeys to none 2014-08-14 19:12:29 +02:00
Vincent Breitmoser
6e7b999409 fix subkey certification canonicalization (why did the test not catch this?!) 2014-08-14 18:57:55 +02:00
Dominik Schürmann
28df004cbb Merge pull request #767 from mar-v-in/issue-763 
Use dropdown in CertifyActivity
 2014-08-14 18:53:40 +02:00
Dominik Schürmann
a58440b85d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-14 18:51:44 +02:00
Dominik Schürmann
65e76f6e44 hacky fix to prevent key list from scrolling to top when opening nav drawer 2014-08-14 18:51:35 +02:00
mar-v-in
e1958009bd Do not allow self certifying 2014-08-14 18:10:22 +02:00
Vincent Breitmoser
9af301ec77 handle modify and save errors in KeychainIntentResult 2014-08-14 17:12:17 +02:00
Vincent Breitmoser
9c03889390 tests: add ProviderHelperSaveTest, with long key id collision test 2014-08-14 17:10:40 +02:00
Vincent Breitmoser
2c408f679c dem logix 2014-08-14 16:34:57 +02:00
Vincent Breitmoser
a19784ed7e merge: check fingerprints on merge operation! (this needs a testcase!) 2014-08-14 16:28:03 +02:00
Dominik Schürmann
05da0f4328 change keybase hint following pull request #755 2014-08-14 16:20:24 +02:00
mar-v-in
eebd480e8d Fix KeySpinner on cursor change 2014-08-14 16:14:16 +02:00
Dominik Schürmann
9ad09a3982 Automcomplete names and emails in keyserver tab 2014-08-14 16:12:42 +02:00
mar-v-in
a6118877ff Add and use CertifyKeySpinner 2014-08-14 16:02:28 +02:00
mar-v-in
00286744f2 small bug in has_certify 2014-08-14 16:02:28 +02:00
mar-v-in
07d6a26778 add OnKeyChangedListener to KeySpinner 2014-08-14 16:02:27 +02:00
mar-v-in
9fab740aad add HAS_CERTIFY (not sure why it's missing) 2014-08-14 16:02:27 +02:00
mar-v-in
ef2449917e factor KeySpinner out 2014-08-14 16:02:27 +02:00
Dominik Schürmann
62f7bf6215 move v3 key import prevention into canonicalization method 2014-08-14 15:58:26 +02:00
Dominik Schürmann
0a1de8deea Do not import v3 keys, they are insecure! 2014-08-14 15:42:02 +02:00
Dominik Schürmann
225e248293 Remove MD5 support 2014-08-14 15:30:08 +02:00
Dominik Schürmann
e72e47d92e Remove support for v3 sig generation 2014-08-14 15:24:37 +02:00
Dominik Schürmann
ad69e47cec Support for multiple hash algos 2014-08-14 14:50:13 +02:00
Dominik Schürmann
6da17ef6bb Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
 2014-08-14 13:31:01 +02:00
Dominik Schürmann
37edd0f390 API: Return metadata only for v4 api clients and above... 2014-08-14 13:10:38 +02:00
Dominik Schürmann
1a8606f194 API: Return metadata only for v4 api clients 2014-08-14 13:08:39 +02:00
Dominik Schürmann
2fa613ad62 Merge pull request #766 from mar-v-in/patch-1 
Handle keys without expiry date right
 2014-08-14 11:43:50 +02:00
Dominik Schürmann
d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +02:00
mar-v-in
b8f7dd5676 Handle keys without expiry date right 
Fixes #765
 2014-08-14 11:21:59 +02:00
Dominik Schürmann
f941431d63 Add user info dialog 2014-08-13 21:49:04 +02:00
Dominik Schürmann
c7d5b09286 Move certify action down into actions section 2014-08-13 21:23:01 +02:00
Dominik Schürmann
db12f782f2 API: User interaction when account keys are deleted 2014-08-13 18:48:42 +02:00
Dominik Schürmann
38da2af0e8 Better error handling for passphrase cache if key is missing 2014-08-13 16:37:28 +02:00
mar-v-in
f34597a3c0 remove bundle for symmetric/asymmetric fragment as it was useless 2014-08-13 13:02:30 +02:00
mar-v-in
e8b7bbd978 fix message and uri from encrypt intent 2014-08-13 12:48:02 +02:00
Dominik Schürmann
fd055a893b Fix DECRYPT_METADATA api 2014-08-12 17:04:11 +02:00
Dominik Schürmann
2bca58742b Merge pull request #758 from mar-v-in/encrypt-only-show-relevant-keys 
EncryptActivity: only show relevant keys
 2014-08-12 14:15:11 +02:00
mar-v-in
82a41a2f7c Only show relevant keys in encrypt, fix #756 #757 2014-08-12 13:56:30 +02:00
mar-v-in
80674021b5 Add convenience method to unified keyrings to determine whether a keyring is expired, fix is_revoked for certain usages 2014-08-12 13:54:56 +02:00
Dominik Schürmann
a4a6314041 Fix API version support, update api lib 2014-08-12 13:54:46 +02:00
mar-v-in
4fdf9ab486 Only show keyrings that have a valid sign key in from field, fixes #756 2014-08-12 12:57:08 +02:00
Dominik Schürmann
ae5e75f4e1 Implement EXTRA_ORIGINAL_FILENAME for API 2014-08-11 23:57:11 +02:00
Dominik Schürmann
acf5b99434 Update api lib 2014-08-11 21:26:52 +02:00
Dominik Schürmann
abf50c3750 Support mime type in metadata 2014-08-11 20:16:21 +02:00
Dominik Schürmann
d5b40de70a Decrypt metadata api 2014-08-11 17:29:41 +02:00
Dominik Schürmann
59096b37fd Support API versions 3 and 4 2014-08-11 17:22:53 +02:00
Dominik Schürmann
b673565035 Get original filename for decryption 2014-08-11 17:10:47 +02:00
Dominik Schürmann
549feb69ed Add option to pass original filename to PgpSignEncrypt 2014-08-11 10:00:24 +02:00
Dominik Schürmann
94b7b1b5d8 progress for signing binary 2014-08-11 09:55:24 +02:00
Dominik Schürmann
867b89be0a More fixes for decryption progress 2014-08-11 01:31:51 +02:00
Dominik Schürmann
13f86890d6 Handle missing MDC as failed only if no valid signature is present 2014-08-10 21:50:46 +02:00
Dominik Schürmann
33a4d68520 More fixes for decryption progress 2014-08-10 21:09:10 +02:00
Dominik Schürmann
c981902aba Handle missing integrity protection MDC packet as if integrity check would have failed. 
An attacker could strip the MDC on its way to the receiver...
 2014-08-10 20:59:13 +02:00
Dominik Schürmann
b0821a3ddd Introduction of metadata api, starting to fix decryption progress 2014-08-10 20:44:02 +02:00
Dominik Schürmann
1abae04cda Fix compression setting for encryption of files 2014-08-10 20:27:34 +02:00
Dominik Schürmann
65fd0de7e1 passphrase instead of pass phrase 2014-08-07 11:17:58 +02:00
Dominik Schürmann
d4105420f7 Pull from transifex 2014-08-07 10:01:57 +02:00
Dominik Schürmann
a908c7de67 Readd missing string 2014-08-07 10:01:42 +02:00
Dominik Schürmann
bac767d184 Edit key: prevent the combination of change to primary user id and revocation 2014-08-07 08:51:56 +02:00
Dominik Schürmann
881a50207a Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
 2014-08-06 01:08:12 +02:00
Dominik Schürmann
6ba7536838 ModernPGP infos 2014-08-06 00:59:38 +02:00
Dominik Schürmann
8b0c389b1b Update changelog and about 2014-08-06 00:32:04 +02:00
Dominik Schürmann
e4974ac409 Use CompressionAlgorithmTags instead of homebrew constants 2014-08-05 23:50:59 +02:00
Dominik Schürmann
f4802157dd Optimize imports 2014-08-05 22:46:00 +02:00
Dominik Schürmann
6354b2dcf9 Increase maximum custom RSA size 2014-08-05 22:38:36 +02:00
Dominik Schürmann
1455af2eed Edit key: key flags 2014-08-05 22:35:37 +02:00
Dominik Schürmann
f8a222983e Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry selection for adding new subkeys 2014-08-05 20:52:29 +02:00
Dominik Schürmann
39380a3617 More work on add subkey dialog design 2014-08-05 18:42:55 +02:00
Dominik Schürmann
04cdd45e1a Work on add subkey dialog design 2014-08-05 18:35:48 +02:00
Dominik Schürmann
d377d1f23d Better handling of user id revocation in UI code 2014-08-05 17:59:05 +02:00
Dominik Schürmann
160e6972d8 Create key: make single user id primary user id, other cleanup 2014-08-05 17:25:22 +02:00
Dominik Schürmann
369f6e080c Refactor expiry dialog 2014-08-05 15:07:11 +02:00
Dominik Schürmann
e9fccff8bc Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-05 00:23:15 +02:00
Dominik Schürmann
80408460a0 KeychainContract: use longs instead of String, other fixes 2014-08-05 00:23:04 +02:00
mar-v-in
2712c18a7a Use size of input uris for progress bar in encrypt/decrypt 2014-08-04 20:34:00 +02:00
Dominik Schürmann
ce8d38d9b3 Add license headers 2014-08-04 16:46:23 +02:00
Dominik Schürmann
7eafd77e15 Fix nullpointer, remove unused window feature 2014-08-04 16:37:42 +02:00
Dominik Schürmann
f5f6102458 Pull from transifex 2014-08-04 16:33:05 +02:00
Dominik Schürmann
a2c1221397 Fixing lint complaints, removing unused resources 2014-08-04 16:29:16 +02:00
Dominik Schürmann
3a6ac2a16a More cleanup 2014-08-04 15:49:49 +02:00
Dominik Schürmann
e87c69647c Even more smaller nitpicks 2014-08-04 15:40:34 +02:00
Dominik Schürmann
c4311e2f52 Remove support for IO_FILE, this is no longer used and was never a good practice, use IO_URI on Android! 2014-08-04 14:44:11 +02:00
Dominik Schürmann
839294d27c Cleanup, prevent encrypt Intent inception 2014-08-04 14:42:03 +02:00
Dominik Schürmann
b42afcd32c Fix debug backup/restore methods 2014-08-04 11:19:46 +02:00
Dominik Schürmann
fb5c829ff7 Remove old edit key stuff 2014-08-04 02:31:54 +02:00
Dominik Schürmann
7f463ae0df Edit key: subkey adding, not finished 2014-08-04 02:26:34 +02:00
Dominik Schürmann
c39cf197f4 button language in encrypt 2014-08-04 00:54:57 +02:00
Dominik Schürmann
d9ffc26d64 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-04 00:49:25 +02:00
Dominik Schürmann
4979ccd645 Smaller UI fixes 2014-08-04 00:49:16 +02:00
Vincent Breitmoser
d4240f73f5 delete unused PgpConversionHelper 2014-08-04 00:39:59 +02:00
Dominik Schürmann
c2ca841ac9 Merge pull request #728 from mar-v-in/improve-file-more 
Improve file encrypt
 2014-08-04 00:21:59 +02:00
mar-v-in
d4f2d3842b Minor cleanup 2014-08-02 04:16:26 +02:00
mar-v-in
e17c1a0cd4 Fix focusing with To field 2014-08-02 00:52:34 +02:00
mar-v-in
9d101b4fe5 Encrypt UI (drop downs) 2014-08-01 23:30:31 +02:00
Dominik Schürmann
0bfac9989f Merge branch 'master' into yubikey 2014-08-01 17:54:53 +02:00
Dominik Schürmann
f72a07690c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-01 17:54:10 +02:00
Vincent Breitmoser
80ed3464f4 small fix for MSG_MF_UID_ADD log entry 2014-08-01 17:52:27 +02:00
Dominik Schürmann
c9b028804c Add user id with dialog 2014-08-01 17:47:07 +02:00