moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity
2,794 Commits 12 Branches 24 Tags 116 MiB
5444c14ef9
Commit Graph

958 Commits

Author SHA1 Message Date
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
Vincent Breitmoser
f555447011 fix dumb mistake in modifySecretKey 2014-08-01 17:46:04 +02:00
Vincent Breitmoser
827a958e12 remove debug output about security providers (cleaner unit tests) 2014-08-01 17:00:08 +02:00
Vincent Breitmoser
c0edaf9a5e make FileImportCache generic, iterable, and add unit test 2014-08-01 16:59:48 +02:00
Vincent Breitmoser
11e5261f07 move classes around a bit 2014-08-01 16:50:33 +02:00
mar-v-in
b206b6d351 Cache input file thumbnail. 2014-08-01 12:41:30 +02:00
mar-v-in
1ebb92b336 Cache contact photos to make UI more fluid 2014-08-01 12:24:26 +02:00
mar-v-in
3a13cd5e4d Fix first key is not used erroneously 2014-08-01 12:23:31 +02:00
Dominik Schürmann
e10cbc54c6 Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
 2014-08-01 11:09:25 +02:00
mar-v-in
0568632f32 Merge branch 'master' into improve-file-more 2014-08-01 10:32:20 +02:00
Dominik Schürmann
acbf2a1861 Remve cacheing of keyrings (cleanup of #726) 2014-08-01 09:35:38 +02:00
Dominik Schürmann
6ab19ca363 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-01 09:34:10 +02:00
Dominik Schürmann
d2f50eb60f identity instead of credentials 2014-08-01 09:34:07 +02:00
Dominik Schürmann
13a85e5702 Merge pull request #726 from mar-v-in/fix-import-from-server 
Fix import from server
 2014-08-01 09:31:17 +02:00
mar-v-in
4b2b1a25e3 Fix CachedPublicKeyring 
I had this code already in my git, but it was in between the load of other things in there, just pulled it out.
 2014-08-01 05:37:21 +02:00
mar-v-in
00f5352ddc Fixes after merge 2014-08-01 05:31:04 +02:00
mar-v-in
fc2a1f5838 Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
 2014-08-01 05:29:40 +02:00
mar-v-in
3a97c36d4a Undo import changes 2014-08-01 05:16:08 +02:00
mar-v-in
159c532ae2 Fix import from server 
Was broken since 7bbe869c88
This also keeps the ACTION_IMPORT_KEYRING action stable
 2014-08-01 05:11:24 +02:00
Dominik Schürmann
79f69f2fce Start fixing CachedPublicKeyRing 2014-08-01 00:38:36 +02:00
Dominik Schürmann
a25ca5429f Certifying instead of signing 2014-08-01 00:22:15 +02:00
Dominik Schürmann
f7cbf39555 Remove runtime check to fix passphrase service 2014-08-01 00:18:46 +02:00
Dominik Schürmann
a86b1d92f8 Use darker colors 2014-08-01 00:18:29 +02:00
Dominik Schürmann
afe56e08fe Show file tab only for import of existing keys 2014-08-01 00:10:01 +02:00
Dominik Schürmann
08ae9db4ee Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 23:54:11 +02:00
Dominik Schürmann
55b764eb1d Show revoked and expired for private keys 2014-07-31 23:54:02 +02:00
Dominik Schürmann
3451111edd Fix update from keyserver 2014-07-31 23:51:08 +02:00
Vincent Breitmoser
faf3868f01 lowercase all key ids from keyserver 2014-07-31 23:49:53 +02:00
Vincent Breitmoser
3d7cdf5428 move upload/update buttons from menu to buttons 2014-07-31 23:49:53 +02:00
mar-v-in
c71cdc1432 Fix string resources 2014-07-31 23:36:37 +02:00
Dominik Schürmann
3e918a70ea Remove private/secret key language from strings 2014-07-31 23:34:13 +02:00
Dominik Schürmann
97209f9d3d Fixes for upload 2014-07-31 23:31:09 +02:00
mar-v-in
36d8c9f608 Fix merge 2014-07-31 23:20:43 +02:00
mar-v-in
eae7c711a3 Merge branch 'master' into improve-file-more 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
 2014-07-31 23:19:01 +02:00
Dominik Schürmann
38120ae77c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 23:13:33 +02:00
Dominik Schürmann
db70fcfdbf Create key: design fixes 2014-07-31 23:13:29 +02:00
Vincent Breitmoser
caad5d1fc1 fix bug in UploadKeyActivity, minor work on uri handling 2014-07-31 23:07:20 +02:00
Vincent Breitmoser
c5ce794ef7 more fixes on canonicalization and progress 2014-07-31 22:36:25 +02:00
mar-v-in
0c7eea225b - add multi select for storage api (kitkat) 
- UI fixes
- refactoring
 2014-07-31 22:21:46 +02:00
Dominik Schürmann
50aea621ba Fix animations in create key 2014-07-31 21:51:35 +02:00
Dominik Schürmann
b9694ae9c5 Add notify layouts to some activities 2014-07-31 21:29:45 +02:00
Dominik Schürmann
38922f96a6 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 21:20:16 +02:00
Dominik Schürmann
138d5a1d9c Robots like coffee too... 2014-07-31 21:18:24 +02:00
Vincent Breitmoser
58c2ca6eb8 completely overengineer progress indication in {modify,create}SecretKeyRing methods 2014-07-31 20:59:50 +02:00
Dominik Schürmann
7bbe869c88 Parcelable data over 1MB can not be send through binder, parcel into a cache file, fix #592 2014-07-31 20:38:06 +02:00
Vincent Breitmoser
d48e980946 avoid nullpointerexception in EditKeyResult 2014-07-31 19:27:26 +02:00
Vincent Breitmoser
acb5a70e44 fix fromStream method, properly recognize multiple concatenated streams 2014-07-31 19:27:26 +02:00
Vincent Breitmoser
b40081c364 always return an EditKeyResult in modifyKey method 2014-07-31 19:27:25 +02:00
Dominik Schürmann
279ddf7cbe Handle result in create key 2014-07-31 19:19:11 +02:00
Dominik Schürmann
258bd3a44f Fix string 2014-07-31 19:06:30 +02:00
Dominik Schürmann
80f9c769c0 Keyserver exception translateable 2014-07-31 19:05:09 +02:00
Dominik Schürmann
b052d5e89c Smaller notes 2014-07-31 18:42:54 +02:00
Vincent Breitmoser
ecb2c2c2b1 reduce memory usage while parsing multiple keyrings from a stream 2014-07-31 18:25:46 +02:00
Dominik Schürmann
aa32c60a0a Even better Exception handling with keyserver queries 2014-07-31 18:07:11 +02:00
Dominik Schürmann
cc034a0913 Exception handling with keyserver queries 2014-07-31 17:56:47 +02:00
Vincent Breitmoser
33172d598d couple of logging fixes 2014-07-31 17:09:30 +02:00
Vincent Breitmoser
b156a057e8 rename Wrapped*Key* to Canonicalized*Key* 2014-07-31 17:09:30 +02:00
Dominik Schürmann
9475285013 Better exception handling for import of keys 2014-07-31 17:11:06 +02:00
Dominik Schürmann
1d2c93ca8a More file association hacks for AndroidManifest and key import 2014-07-31 16:15:36 +02:00
Dominik Schürmann
927b120275 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-30 17:47:25 +02:00
Dominik Schürmann
65488cbf05 Create key: work on upload 2014-07-30 17:47:17 +02:00
Vincent Breitmoser
64aac8023e couple of fixes in save*KeyRing methods 2014-07-30 16:22:55 +02:00
Dominik Schürmann
fcc535a573 Create key: repeat passphrase 2014-07-30 15:29:01 +02:00
Dominik Schürmann
052cdfa392 Create key: upload 2014-07-30 15:19:33 +02:00
Dominik Schürmann
e46d72ba27 Fix drawer in key list 2014-07-30 14:59:12 +02:00
Dominik Schürmann
70bfb5c586 return values for create key 2014-07-30 14:57:59 +02:00
Dominik Schürmann
cdee62b79d Create key: layout above buttons 2014-07-30 01:13:02 +02:00
Dominik Schürmann
9f9aa79066 Fix conflicts 2014-07-30 01:07:10 +02:00
Dominik Schürmann
43b8170a44 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
 2014-07-30 00:58:28 +02:00
Dominik Schürmann
6448de8f6a Create key with fragments 2014-07-30 00:50:53 +02:00
Vincent Breitmoser
4457b4a24c fix a couple remaining AppMsgs 2014-07-29 14:00:36 +02:00
Vincent Breitmoser
377d0f09fa Merge branch 'ditch-appmsg' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
 2014-07-29 13:53:18 +02:00
Vincent Breitmoser
da131220aa watch out for nullpointers from get(Un|)HashedSubpackets 
fixes #721
 2014-07-28 17:09:56 +02:00
Dominik Schürmann
cce243299a Fix build by removing old icon reference 2014-07-28 16:26:06 +02:00
Dominik Schürmann
ed6a89f35c Use new icons in other key related activites, delete old icons 2014-07-28 16:10:36 +02:00
Dominik Schürmann
23689da56d Use verified icon for certify action 2014-07-28 12:24:40 +02:00
Dominik Schürmann
730f820c8c Set visibility at last 2014-07-28 11:17:12 +02:00
Dominik Schürmann
3d6edd1190 Use icons in key view 2014-07-28 11:11:23 +02:00
Dominik Schürmann
a3045c710e Use new status icons in key list 2014-07-28 09:34:57 +02:00
Dominik Schürmann
0c3b2a6ed4 Smaller status images, green test 2014-07-28 09:10:45 +02:00
Dominik Schürmann
b2f7e839e1 Fix resource names, add small test 2014-07-28 01:23:38 +02:00
Dominik Schürmann
61944b9e39 Add icons from ModernPGP project 2014-07-28 01:12:23 +02:00
Dominik Schürmann
6c7e3aee91 Fix background color of notify area 2014-07-27 21:45:48 +02:00
Dominik Schürmann
7e8b056574 cleanup left-overs 2014-07-27 21:44:00 +02:00
Dominik Schürmann
5974dccbea Redesigned QR Code view 2014-07-27 21:40:43 +02:00
Dominik Schürmann
0f87b81158 Load QR Code asynchronously and with a fade in animation 2014-07-27 20:58:25 +02:00
Dominik Schürmann
57d9c7a013 Open keyboard on passphrase dialog, this should now work on all Android versions... hopefully 2014-07-27 20:42:39 +02:00
Dominik Schürmann
97e8faa1dd Make PassphraseCacheService a foreground service 2014-07-27 18:56:23 +02:00
Dominik Schürmann
0403cbf11a Prettify buttons 2014-07-27 18:12:14 +02:00
Dominik Schürmann
dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +02:00
Vincent Breitmoser
f4ee71e3ef introduce EditKeyResult with transient UncachedKeyRing (half-baked!) 2014-07-27 01:22:10 +02:00
Vincent Breitmoser
a8782272b3 some more work on supertoast and result parcel stuff 2014-07-27 00:46:38 +02:00
Vincent Breitmoser
8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-07-26 23:06:32 +02:00
Vincent Breitmoser
45722d7cfb canonicalize: couple of fixes 2014-07-26 22:16:33 +02:00
Vincent Breitmoser
236a502ea7 generic UncachedKeyRing fixes 2014-07-26 15:51:35 +02:00
Vincent Breitmoser
043ed600e6 Merge remote-tracking branch 'origin/master' 2014-07-26 03:59:12 +02:00
Vincent Breitmoser
7296ac4849 UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings 2014-07-26 03:57:54 +02:00
Vincent Breitmoser
7fe1b00080 fixes for extractPublicKeyRing, update SpongyCastle 2014-07-26 03:56:28 +02:00
Vincent Breitmoser
ab2b90342e test and fix: adding an empty user id should fail 2014-07-26 03:47:29 +02:00
mar-v-in
1e4f0c6b00 Make DecryptFragment abstract, as it should be 2014-07-25 13:39:54 +02:00
Dominik Schürmann
5eb414a22b Program flow fixes 2014-07-25 01:34:29 +02:00
Dominik Schürmann
bf10eb91b7 Remove support for V3 signatures 2014-07-22 18:24:12 +02:00
Dominik Schürmann
e4e8bc5e07 Cleanup 2014-07-22 18:14:17 +02:00
Dominik Schürmann
99af2c33d3 Reuse signature creation timestamp for synchronous signing 2014-07-22 18:09:12 +02:00
Dominik Schürmann
afd6851e5b Fix test 2014-07-21 15:25:09 +02:00
Dominik Schürmann
2f5c73746d Merge branch 'master' into yubikey 2014-07-21 15:11:59 +02:00
Dominik Schürmann
d882572f0d NFC Yubikey: only pass through hash of message and not whole content 2014-07-21 15:10:29 +02:00
Vincent Breitmoser
f560bc9317 forgot to move test classpath out of root project 2014-07-21 03:59:28 +02:00
mar-v-in
2913a78b18 Load of rework on EncryptActivity, still some TODOs 2014-07-20 17:09:34 +02:00
Vincent Breitmoser
cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Dominik Schürmann
a10f582513 Merge branch 'master' into yubikey 2014-07-18 09:56:39 +02:00
Dominik Schürmann
b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master 
Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
 2014-07-18 09:49:20 +02:00
Daniel Albert
db002bde7c Fixed another unescaped apostrophe. 2014-07-17 21:17:39 +02:00