cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,185 Commits 1 Branch 0 Tags
a8e95f676e580cfbab030aa0f58167a41149d00f
Commit Graph
480 Commits
Author SHA1 Message Date
Dominik Schürmann af762a65a0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-06 14:52:12 +01:00
Dominik Schürmann e34ad18ed2 Passphrase wizard tests 2015-01-06 14:52:07 +01:00
Vincent Breitmoser 47ace7cea3 make certify routines more robust (#1016) 2015-01-03 22:14:12 +01:00
Vincent Breitmoser 2192a6badd add more descriptive string about non-mdc encrypted data 2015-01-03 21:07:33 +01:00
Vincent Breitmoser 320f7d35ef encapsulate high level edit key into new operation class 2015-01-03 13:55:15 +01:00
Vincent Breitmoser 5057ea1744 deal with non-existent user ids during import (#994) 2015-01-02 14:28:03 +01:00
Vincent Breitmoser 7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser 1c1ae769ef small improvements regarding pin tests and logging 2015-01-01 21:13:07 +01:00
Vincent Breitmoser 9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-12-30 13:09:27 +01:00
Vincent Breitmoser 438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Vincent Breitmoser c7b0b650c1 introduce handling of notation direct key signatures, and experimental pin notation packet 2014-12-30 00:44:12 +01:00
Dominik Schürmann 610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Tim Bray 2a608c12ca Check fingerprint match between proof & database 2014-11-22 09:27:28 -08:00
Dominik Schürmann 47caad3edb Merge branch 'development' into keybase-proofs 2014-11-21 23:55:17 +01:00
Dominik Schürmann dd65d10406 NFC activity design 2014-11-21 13:31:43 +01:00
Tim Bray b5cdeb7f5a Prevent multiple cloud-trust-search launches. Handle DNS query failure gracefully. Fixes #1007 & #1008. 2014-11-19 14:35:05 -08:00
Tim Bray 0f59e6bd95 In the ImportKeysList display, arrange for Keybase UserIDs to sort below the rest. Also mention Keybase stuff other than Twitter/GitHub/Website 2014-11-18 22:12:50 -08:00
Tim Bray 36bac67dd5 All keybase proofs now in place 2014-11-11 18:45:36 -08:00
Tim Bray c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
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