Commit Graph

3026 Commits

Author SHA1 Message Date
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
4934c25fea Move design doc into wiki 2014-08-07 09:29:01 +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
ef67962c5d Info about travis test failings 2014-08-06 08:05:59 +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
9b1efdcdad Start with changelog 2014-08-06 00:20:08 +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
Dominik Schürmann
b617112c9b Merge pull request #736 from mar-v-in/use-file-size
Use size of input uris for progress bar in encrypt/decrypt
2014-08-05 00:12:39 +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
de6950377c Lint fixes 2014-08-04 17:10:56 +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
a8b8ed6f14 Gradle troubleshooting info 2014-08-04 09:59:11 +02:00
Dominik Schürmann
da163c8d3d TokenAutoComplete: Do not abort build if lint finds errors 2014-08-04 02:37:41 +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