Commit Graph
330 Commits
Author SHA1 Message Date
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
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
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 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 e72e47d92e Remove support for v3 sig generation 2014-08-14 15:24:37 +02:00
Dominik Schürmann d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +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 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 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 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 369f6e080c Refactor expiry dialog 2014-08-05 15:07:11 +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 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 e87c69647c Even more smaller nitpicks 2014-08-04 15:40:34 +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 4979ccd645 Smaller UI fixes 2014-08-04 00:49:16 +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 c9b028804c Add user id with dialog 2014-08-01 17:47:07 +02:00
mar-v-in 0568632f32 Merge branch 'master' into improve-file-more 2014-08-01 10:32:20 +02:00
Dominik Schürmann d2f50eb60f identity instead of credentials 2014-08-01 09:34:07 +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
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
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