Commit Graph

3330 Commits

Author SHA1 Message Date
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
35c80ed429 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:01:00 +01:00
Vincent Breitmoser
082722a3cf prevent cancel dring consolidate, move logic into progressable 2014-10-26 22:00:57 +01:00
Dominik Schürmann
4aed570ee3 3.1beta1 2014-10-26 05:28:57 +01:00
Vincent Breitmoser
b8ed54bc69 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 05:25:54 +01:00
Vincent Breitmoser
84a57411a5 add descriptive text to safeslinger activity 2014-10-26 02:12:29 +01:00
Dominik Schürmann
aaa4753503 Fix decrypt intent api 2014-10-26 02:00:52 +01:00
Dominik Schürmann
dd007e9664 Hide keyboard in safe slinger activity 2014-10-26 02:36:57 +02: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
3059007995 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 01:09:46 +02:00
Dominik Schürmann
97baa0e52f Keyboard tests 2014-10-26 01:09:35 +02:00
Vincent Breitmoser
108b35cb50 add description of symantec test case 2014-10-26 00:41:36 +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
Vincent Breitmoser
8b778809bf add test case for symantec secret keys (#974) 2014-10-26 00:34:16 +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
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
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
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
Dominik Schürmann
49b237d609 Fix safe slinger button 2014-10-25 02:42:13 +02:00