Commit Graph
461 Commits
Author SHA1 Message Date
Vincent Breitmoser 84b234af37 Display error on certification attempt with yubikey
Closes #978
2014-10-26 22:29:47 +01:00
Vincent Breitmoser 84a57411a5 add descriptive text to safeslinger activity 2014-10-26 02:12:29 +01:00
Dominik Schürmann be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
Dominik Schürmann 825baeee1b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 00:38:31 +02:00
Dominik Schürmann 8257e450f9 Fixes from transifex 2014-10-26 00:38:25 +02:00
Vincent Breitmoser fb7264d7fd Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 00:34:19 +02:00
Dominik Schürmann f51aebf52d Move some multi select items in overflow menu, rename import 2014-10-26 00:30:10 +02:00
Vincent Breitmoser 33738b1f52 Retry canonicalization with pubkey self certs if first attempt failed
Fixes #974
2014-10-26 00:26:13 +02:00
Dominik Schürmann 74bac3ea36 Remove empty layout 2014-10-25 23:36:48 +02:00
Vincent Breitmoser 26bd847c32 shorter certification explanation 2014-10-25 03:18:54 +02:00
Vincent Breitmoser ce4b8edaab more rewording 2014-10-25 03:18:54 +02:00
Vincent Breitmoser 748049fb5b slightly change wording in merge logs 2014-10-25 02:50:48 +02:00
Vincent Breitmoser c5028dc9ce Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:49:37 +02:00
Vincent Breitmoser 30d0afa363 change the way merging is logged 2014-10-25 02:45:16 +02:00
Dominik Schürmann e332c664cf Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:38:09 +02:00
Dominik Schürmann 33b54ab03e Safe slinger activity preps 2014-10-25 02:38:06 +02:00
Vincent Breitmoser ba724353e5 more work on import logging 2014-10-25 02:13:02 +02:00
Vincent Breitmoser 478b2a4d8b add logging to import and change order of import, keyservers first 2014-10-25 01:59:15 +02:00
Dominik Schürmann 1cbedb60d6 Qr code button text 2014-10-24 00:44:26 +02:00
Tim Bray d4fb71cb76 reword sync message 2014-10-22 08:19:13 -07:00
Tim Bray 0516b80c07 Make the Certify screen a little more self-explanatory 2014-10-21 11:35:03 -07:00
Dominik Schürmann dc87557805 Group passphrase cache settings 2014-10-13 19:34:41 +02:00
Dominik Schürmann b86d235177 wording 2014-10-13 14:44:23 +02:00
Jerzy Kołosowski 13ed3bbd8a Added option for num keypad for YubiKey 2014-10-13 04:47:48 +02:00
Vincent Breitmoser 815ed2e233 rewrite export with new operation style 2014-10-13 00:26:59 +02:00
Vincent Breitmoser 5453a3e5af DeleteResult: add custom createNotify 2014-10-11 19:55:19 +02:00
Vincent Breitmoser e6a7960b8f move delete into operation class 2014-10-11 03:50:21 +02:00
Vincent Breitmoser ee00894e27 different wording in share tab 2014-10-10 19:43:34 +02:00
Dominik Schürmann 0d6d4653b4 Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys 2014-10-08 18:31:31 +02:00
Dominik Schürmann 2eb776594f Handle revoked and expired keys in decrypt activity 2014-10-08 17:39:53 +02:00
Dominik Schürmann 158f22a799 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-08 17:32:41 +02:00
Dominik Schürmann b573afe235 New decryption screen UI with modernPGP icons 2014-10-08 17:32:32 +02:00
Vincent Breitmoser 1b160f68c9 slightly change text in certify dialog 2014-10-08 15:15:25 +02:00
Dominik Schürmann adcc07ca65 Filter key list by certified keys 2014-10-08 14:42:56 +02:00
Dominik Schürmann 27d062496f Fix MSG_MF_UID_PRIMARY log 2014-10-07 17:50:09 +02:00
Dominik Schürmann a150c0f480 Certify design 2014-10-07 17:24:20 +02:00
Dominik Schürmann 280899410f Certify design 2014-10-07 17:21:46 +02:00
Vincent Breitmoser b16a550fbb multicertify: move key spinner to the bottom 2014-10-06 15:41:15 +02:00
Dominik Schürmann 2768671206 UI stuff 2014-10-05 10:59:52 +02:00
Vincent Breitmoser 60fb3b60a8 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
2014-10-05 01:22:01 +02:00
Dominik Schürmann d99115c263 preselect certify key 2014-10-05 01:23:34 +02:00
Vincent Breitmoser dff68ac194 more layout neatification 2014-10-05 01:21:24 +02:00
Vincent Breitmoser 2b436b9a19 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:16:58 +02:00
Vincent Breitmoser bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) 2014-10-04 23:16:51 +02:00
Dominik Schürmann 0599f0dd4e Workings on new parcel for key downloads 2014-10-04 21:09:32 +02:00
Dominik Schürmann 9e1a0c2c0a Pass imported master key ids via result parcel 2014-10-04 18:59:59 +02:00
Vincent Breitmoser 0ffa1b94de certify: get rid of fingerprint check
Master key ids are unambiguous by database design, and only keys which
are in the database are signed. There is no reason to check the
fingerprint again during the certify operation.
2014-10-04 18:30:14 +02:00
Vincent Breitmoser 7e5918efa3 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 16:02:18 +02:00
Vincent Breitmoser d004bf236b improve CertifyResult, add custom notify 2014-10-04 16:01:24 +02:00
Dominik Schürmann 7891560fc2 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 15:42:36 +02:00