Commit Graph
1436 Commits
Author SHA1 Message Date
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 3c19e6cfc1 Fix a no-result corner case, and make verifications clickable 2014-11-07 21:07:10 -08:00
Tim Bray c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
Vincent Breitmoser 1886dd1790 export secret and public keys in separate armored blocks 2014-10-31 18:18:09 +01:00
Vincent Breitmoser 8720a21106 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 19:48:27 +01:00
Vincent Breitmoser 7017527999 forgot a thing for secret key export 2014-10-30 15:14:44 +01:00
Dominik Schürmann 26a4cf2a56 Changelog 3.1.1 2014-10-30 12:48:06 +01:00
Dominik Schürmann 18255e331b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-30 12:44:13 +01:00
Dominik Schürmann 30c3021fea Always use INTEGER instead of BOOLEAN in database to avoid confusion 2014-10-29 23:41:10 +01:00
Vincent Breitmoser a221464f38 Fix to preselect certification key if only one is available
Closes #981
2014-10-29 22:47:34 +01:00
Vincent Breitmoser 8b53bed6c0 remove unused ExchangeKeySpinner class 2014-10-29 22:45:49 +01:00
Vincent Breitmoser e1285eec7b Close stream on key export to avoid partial write (see #986) 2014-10-29 22:39:38 +01:00
Vincent Breitmoser 727783dd00 retrofit getBlob method of matrixcursor for android 2.3 2014-10-27 17:36:53 +01:00
Dominik Schürmann e1b0908290 Fix crash with NotFoundException 2014-10-26 22:49:34 +01:00
Dominik Schürmann 1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Dominik Schürmann be31815ee8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:38:35 +01:00
Dominik Schürmann fa73362a9f Fix notify after certify 2014-10-26 22:38:30 +01:00
Vincent Breitmoser 84b234af37 Display error on certification attempt with yubikey
Closes #978
2014-10-26 22:29:47 +01:00
Vincent Breitmoser ce58eb4b03 disable cancel button instead of hiding it on cancel prevention 2014-10-26 22:26:05 +01:00
Vincent Breitmoser 5ce89c4af8 fix consolidate if no secret key are present 2014-10-26 22:20:44 +01:00
Vincent Breitmoser 082722a3cf prevent cancel dring consolidate, move logic into progressable 2014-10-26 22:00:57 +01:00
Dominik Schürmann 3325ff57a7 Use new safe slinger activity from share tab 2014-10-26 02:34:51 +02:00
Dominik Schürmann 4631f45ed7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 02:17:26 +02:00
Dominik Schürmann be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
Vincent Breitmoser d6b9fc27b7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 01:54:12 +02:00
Vincent Breitmoser 510ef40f55 implement upload of keyring after certification, check that option by default 2014-10-26 01:50:48 +02:00
Dominik Schürmann 97baa0e52f Keyboard tests 2014-10-26 01:09:35 +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
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 94693efbe5 Fail on unknown key ids on API, Key item design consistency for API 2014-10-26 00:19:14 +02:00
Dominik Schürmann e4391c282d Fix layout of select key adapter 2014-10-26 00:15:35 +02:00
Dominik Schürmann 74bac3ea36 Remove empty layout 2014-10-25 23:36:48 +02:00
Dominik Schürmann 94e7bbb67b Remove PassphraseDialogFragment 2014-10-25 22:56:27 +02:00
Dominik Schürmann ad60ec2d00 Remove old certify activity 2014-10-25 22:55:16 +02:00
Dominik Schürmann c1ef9ed149 Use passphrase dialog activity instead of passphrase dialog 2014-10-25 22:53:35 +02:00
Dominik Schürmann 1099382250 Remove old exception handling code from loaders 2014-10-25 22:31:28 +02:00
Dominik Schürmann 8dddc82f69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 22:25:14 +02:00
Dominik Schürmann 4f37c88ea7 Fix color in import list 2014-10-25 22:25:11 +02:00
Vincent Breitmoser b9c0504465 remove unnecessary (and buggy) BufferedInputStream wrapping 2014-10-25 22:20:55 +02:00
Dominik Schürmann c2e7c2416f Remove tabs from import keys activity 2014-10-25 22:05:55 +02:00
Dominik Schürmann 71e3fb5380 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 21:15:12 +02:00
Dominik Schürmann 0abfff0b0e Fixes and icons for apps list, also add Password Store 2014-10-25 21:15:05 +02:00
Vincent Breitmoser ce4b8edaab more rewording 2014-10-25 03:18:54 +02:00
Dominik Schürmann d3e0e823e3 Fix result passing 2014-10-25 03:06:39 +02:00
Dominik Schürmann e11df08ea1 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-25 02:57:42 +02:00
Dominik Schürmann 339b283df5 Safeslinger fixesÄ 2014-10-25 02:57:33 +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