moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity
3,938 Commits 12 Branches 24 Tags 116 MiB
recyclerview-wip
Commit Graph

1939 Commits

Author SHA1 Message Date
Dominik Schürmann
320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann
a86abe04cd Allow for creation date to be in the future up to one day to account for diverging clocks on different systems for fresh keys 2014-12-28 20:57:03 +01:00
Dominik Schürmann
7dbf0abf7b Fix crash on first time wizard 2014-12-28 19:06:17 +01:00
Dominik Schürmann
5c54ab1a0d Merge branch 'development' into keybase-proofs 2014-12-05 15:51:15 +01:00
Dominik Schürmann
26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +01:00
Dominik Schürmann
6b9749289f Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-04 19:44:27 +01:00
Dominik Schürmann
389d191448 Merge branch 'master' into development 2014-12-04 19:43:41 +01:00
Dominik Schürmann
450ac161b9 Set version to 3.2beta1 2014-12-04 19:26:10 +01:00
cketti
aa8b3db139 Fix spelling of 'K-9 Mail' in FAQ 2014-11-26 04:40:58 +01:00
Tim Bray
2a608c12ca Check fingerprint match between proof & database 2014-11-22 09:27:28 -08:00
Tim Bray
734a085f0d Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
 2014-11-21 19:45:35 -08:00
Tim Bray
e72c082acd Add check that proof & database fingerprints are the same 2014-11-21 19:44:05 -08:00
Dominik Schürmann
9c133d343f fix signature check 2014-11-22 02:55:42 +01:00
Dominik Schürmann
bbbc45e4e9 Dont accept signatures by expired or revoked subkeys 2014-11-22 00:29:14 +01:00
Dominik Schürmann
fd60d49d26 Use master key id for keybase proof verification 2014-11-22 00:10:15 +01:00
Dominik Schürmann
47caad3edb Merge branch 'development' into keybase-proofs 2014-11-21 23:55:17 +01:00
Dominik Schürmann
a805069c59 more cleanup 2014-11-21 23:55:04 +01:00
Dominik Schürmann
dd65d10406 NFC activity design 2014-11-21 13:31:43 +01:00
Dominik Schürmann
fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Tim Bray
629d83a1ce Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs 2014-11-19 14:37:06 -08: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
Dominik Schürmann
1c0f994d08 Merge branch 'keybase-proofs' of github.com:open-keychain/open-keychain into keybase-proofs 2014-11-19 22:22:18 +01: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
Dominik Schürmann
6691f5118a Version 3.2beta1 2014-11-18 19:04:16 +01: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
4929e346a2 XML fragment for proof listing 2014-11-07 12:29:17 -08:00
Tim Bray
c05441667e Moved from WebView to Spannables, some proof cleanup too 2014-11-07 12:28:27 -08:00
Dominik Schürmann
9de76bb903 Version 3.1.2 2014-11-02 17:54:33 +01:00
Dominik Schürmann
f3da3b31e5 Pull from transifex 2014-11-02 17:54:10 +01:00
Dominik Schürmann
602930d929 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-11-02 17:50:38 +01:00
Dominik Schürmann
9dc8c0d506 Changelog 2014-11-02 17:50:31 +01: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
f10ec91380 Version 3.1.1 2014-10-30 12:54:17 +01:00
Dominik Schürmann
148c9a5c62 Revert "Version 3.1.1" 
This reverts commit 8461f953f6.
 2014-10-30 12:54:01 +01:00
Dominik Schürmann
8461f953f6 Version 3.1.1 2014-10-30 12:53:21 +01:00
Dominik Schürmann
f4d0e5250b Pull from transifex 2014-10-30 12:52:33 +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
3e601431ea Version 3.1 2014-10-26 23:32:57 +01:00
Dominik Schürmann
e02b2ab30c Pull from transifex 2014-10-26 23:32:34 +01:00
Dominik Schürmann
5f20abdb26 Pull from transifex 2014-10-26 23:23:30 +01:00
Dominik Schürmann
893a4620c1 Changelog 3.1 2014-10-26 23:15:46 +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
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
97baa0e52f Keyboard tests 2014-10-26 01:09:35 +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
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
Dominik Schürmann
418f0970ab Fix safe slinger button 2014-10-25 02:41:20 +02:00
Dominik Schürmann
57a26a6cb3 Use selected number of users in safe slinger 2014-10-25 02:39:48 +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
7c4bbc83cb change indentation of import logs 2014-10-25 02:25:39 +02:00
Vincent Breitmoser
059c058040 set padding for sublog entries 2014-10-25 02:25:28 +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
Dominik Schürmann
b1c164bde0 remove space in on large devices in layouts where no drawer nav is shown 2014-10-24 00:39:33 +02:00
Dominik Schürmann
9447f8fdf9 Fix import from cloud 2014-10-24 00:30:58 +02:00
Dominik Schürmann
bfc3774f02 Merge pull request #973 from timbray/development 
Make the Certify screen a little more self-explanatory
 2014-10-24 00:23:40 +02:00
Dominik Schürmann
efa5a80eb6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-10-23 23:33:50 +02:00
Dominik Schürmann
1624cd8349 Start safe slinger activity 2014-10-23 23:31:50 +02:00
Vincent Breitmoser
76a1e99d7e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-23 23:31:28 +02:00
Vincent Breitmoser
214b60cd00 integrate download from keyserver into key import operation 2014-10-23 23:29:40 +02:00
Dominik Schürmann
e494beb58a Externalize QR Code scanning and import into its own activity for better code separation 2014-10-23 17:13:49 +02:00
Dominik Schürmann
ecfa2288eb Fix crash on Android 5 2014-10-22 23:28:13 +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
f4f16e62a2 consistency for import UI 2014-10-16 14:47:36 +02:00
Dominik Schürmann
d09d4296da Silently fail on import on key import with ArrayIndexOutOfBoundsException 2014-10-16 13:36:21 +02:00
Dominik Schürmann
81935fe99b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-15 23:22:12 +02:00
Dominik Schürmann
0cdcc90984 More consisitency 2014-10-15 23:22:08 +02:00
Dominik Schürmann
4e1053c6fa More color/icon consistency 2014-10-15 23:05:29 +02:00
Vincent Breitmoser
b6c7231a7f some cleanup and documentation of *Operation classes 2014-10-15 16:57:23 +02:00
Dominik Schürmann
be9b483ee8 color experiments 2014-10-15 12:48:54 +02:00
Vincent Breitmoser
c7e2b8424e Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-14 16:35:56 +02:00
Vincent Breitmoser
7af0219857 fix test for new PgpDecryptVerify 2014-10-14 16:35:48 +02:00
Vincent Breitmoser
e58ba0f4bb fix export performance problems 2014-10-14 14:19:54 +02:00
Dominik Schürmann
dc87557805 Group passphrase cache settings 2014-10-13 19:34:41 +02:00
Dominik Schürmann
85d4bcca52 Register application/pgp-message for encrypted pgp data, more comments in Manifest 2014-10-13 19:17:23 +02:00
Vincent Breitmoser
40850b933b actually remove filter spinner code. that's what git is for~ 2014-10-13 16:43:17 +02:00
Dominik Schürmann
e9abe57aa7 Remove key list filter for now 2014-10-13 15:53:39 +02:00
Vincent Breitmoser
bfafc44a33 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-13 15:03:49 +02:00
Vincent Breitmoser
d7d2ce7652 fix syntax typo in androidmanifest 2014-10-13 15:03:26 +02:00
Vincent Breitmoser
ee4d911baf make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation 2014-10-13 15:02:42 +02:00
Vincent Breitmoser
e5c7d8dcd1 forgot to remove AddKeysActivity in androidmanifest 2014-10-13 15:01:44 +02:00
Vincent Breitmoser
aec61fd174 remove DELETE_FILE_SECURELY 
closes #961
 2014-10-13 14:55:54 +02:00
Dominik Schürmann
b86d235177 wording 2014-10-13 14:44:23 +02:00
Dominik Schürmann
5219cf5207 Better qr code icon 2014-10-13 14:38:25 +02:00
Jerzy Kołosowski
13ed3bbd8a Added option for num keypad for YubiKey 2014-10-13 04:47:48 +02:00
Vincent Breitmoser
7ff526724b forgot committing ExportResult class 2014-10-13 01:19:35 +02:00
Vincent Breitmoser
6de52a431a remove outdated AddKeysActivity 2014-10-13 00:36:50 +02:00
Vincent Breitmoser
815ed2e233 rewrite export with new operation style 2014-10-13 00:26:59 +02:00
Vincent Breitmoser
b47412eb1e CertifyOperation is not a Pgp- operation 2014-10-12 19:22:34 +02:00
Vincent Breitmoser
93aefaca8e fix logging in consolidate, part 2 2014-10-11 20:04:45 +02:00
Vincent Breitmoser
5453a3e5af DeleteResult: add custom createNotify 2014-10-11 19:55:19 +02:00
Vincent Breitmoser
4bd9c6ff96 fix logging in consolidate, part 1 2014-10-11 19:54:07 +02:00
Vincent Breitmoser
e6a7960b8f move delete into operation class 2014-10-11 03:50:21 +02:00
Vincent Breitmoser
fe981e5498 move around package structure a bit 2014-10-10 19:59:25 +02:00
Vincent Breitmoser
ee00894e27 different wording in share tab 2014-10-10 19:43:34 +02:00
Vincent Breitmoser
ebdcb53c68 fix width of displayed qr code 2014-10-10 19:42:30 +02:00
Vincent Breitmoser
45dcc7d070 move operations into ops package, introduce BaseOperation class 2014-10-10 19:31:43 +02:00
Vincent Breitmoser
21ea040910 add keys button goes to directly to qr scan 2014-10-10 19:05:33 +02:00
Vincent Breitmoser
2dcd070014 keylist: add safeslinger exchange button to secret keys 2014-10-10 19:05:30 +02:00
Vincent Breitmoser
73ccff9537 Merge remote-tracking branch 'origin/development' into development 2014-10-09 16:26:38 +02:00
Vincent Breitmoser
340ed7c08d Merge remote-tracking branch 'origin/master' into development 2014-10-09 16:25:53 +02:00
Vincent Breitmoser
9d01490d4e reduce memory footprint in QrCodeActivity as well 2014-10-09 16:25:38 +02:00
Vincent Breitmoser
a54a0c34fe reduce memory footprint of qr code in share tab 2014-10-09 15:57:44 +02:00
Dominik Schürmann
134e1cb764 Better handling if no api key is selected 2014-10-09 01:52:44 +02:00
Dominik Schürmann
7646baf486 Better handling if no api key is selected 2014-10-09 01:51:35 +02:00
Dominik Schürmann
45b02008fb Replace many PgpGeneralExceptions with PgpKeyNotFoundException 2014-10-09 01:37:44 +02:00
Dominik Schürmann
b3f56c927b Revert "Replace PgpGeneralException with NotFoundException where appropriate" 
This reverts commit 49b4ff6312.
 2014-10-09 00:59:45 +02:00
Dominik Schürmann
a13bcbbb5b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-09 00:58:33 +02:00
Dominik Schürmann
49b4ff6312 Replace PgpGeneralException with NotFoundException where appropriate 2014-10-09 00:58:07 +02:00
Vincent Breitmoser
f6d0347c79 rename certify_key_item to the more appropriate multi_certify_item 2014-10-08 22:47:30 +02:00
Dominik Schürmann
3165f3ffa8 Remove unnecessary exception 2014-10-08 18:33:01 +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
590650a303 remove ui hack, use padding instead of margin 2014-10-08 15:36:18 +02:00
Vincent Breitmoser
1b160f68c9 slightly change text in certify dialog 2014-10-08 15:15:25 +02:00
Vincent Breitmoser
a96813198c use "Key ID" for beautify 2014-10-08 15:15:10 +02:00
Vincent Breitmoser
2d438fbc27 automatically extend single compound entry logs 2014-10-08 15:14:35 +02:00
Dominik Schürmann
adcc07ca65 Filter key list by certified keys 2014-10-08 14:42:56 +02:00
Dominik Schürmann
678265483a Move utf8 check for user id upwards 2014-10-07 18:11:12 +02:00
Dominik Schürmann
27d062496f Fix MSG_MF_UID_PRIMARY log 2014-10-07 17:50:09 +02:00
Dominik Schürmann
355bcfbb66 Remove monospace from encrypt item 2014-10-07 17:37:05 +02:00
Dominik Schürmann
f4c8c47ac2 Cleanup and fix decrypt activity 2014-10-07 17:35:12 +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
a50034bd10 forgot layout piece for 096f6e436 2014-10-06 19:25:29 +02:00
Vincent Breitmoser
84a9085190 get rid of some old code in LogDisplayFragment 2014-10-06 18:58:04 +02:00
Vincent Breitmoser
096f6e436d certify: checkbox fake click area tidbit 2014-10-06 18:50:58 +02:00
Vincent Breitmoser
f703d55bca move "synchronize" checkbox to bottom section as well 2014-10-06 15:42:47 +02:00
Vincent Breitmoser
b16a550fbb multicertify: move key spinner to the bottom 2014-10-06 15:41:15 +02:00
Dominik Schürmann
4b6016fcfc Fix app name 2014-10-05 11:19:19 +02:00
Vincent Breitmoser
12e44e7eeb Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-05 11:11:20 +02:00
Vincent Breitmoser
34345cf237 use sub results in import 2014-10-05 11:11:16 +02:00
Vincent Breitmoser
6699917279 add support for second line in log view 2014-10-05 11:10:40 +02:00
Dominik Schürmann
2768671206 UI stuff 2014-10-05 10:59:52 +02:00
Vincent Breitmoser
7fedde2638 add support for hierarchical log entries 2014-10-05 10:09:50 +02:00
Dominik Schürmann
0b9308753d use status icons in public key selection 2014-10-05 04:09:55 +02:00
Dominik Schürmann
d38b200b01 Add cloud icon 2014-10-05 03:39:44 +02:00
Vincent Breitmoser
84c624517c Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-05 02:25:36 +02:00
Dominik Schürmann
03fb3159b8 Give result down to list 2014-10-05 02:24:43 +02:00
Vincent Breitmoser
48c843beae even more layout neatification 2014-10-05 02:15:43 +02:00
Dominik Schürmann
fa2b3054b0 Make bit size optional 2014-10-05 01:46:56 +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
15165d056f slight layout changes to keyspinner_item 2014-10-05 01:07:32 +02:00
Dominik Schürmann
1dbb3db320 Display result in multi certify 2014-10-04 23:47:17 +02:00
Vincent Breitmoser
4b372a5c33 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:31:04 +02:00
Dominik Schürmann
4fcd58b9f8 use new multi certify, layout fixes 2014-10-04 23:32:25 +02:00
Vincent Breitmoser
f96f289891 merge key ids in getSelectedCertifyActions 2014-10-04 23:30:42 +02:00
Vincent Breitmoser
015291eb61 Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify 2014-10-04 23:18:07 +02:00
Vincent Breitmoser
bad8aeea78 implement preliminary MultiCertifyActivity (most heavy lifting is done) 2014-10-04 23:16:51 +02:00
Dominik Schürmann
fbf993e621 add divider 2014-10-04 23:16:17 +02:00
Dominik Schürmann
e75e3d371d qr code download, cleanup 2014-10-04 21:40:28 +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
Dominik Schürmann
c614d8d4e0 Fixing import, start qr code stuff 2014-10-04 18:22:55 +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
23b1ac1716 fix plurals quantity string in ImportKeyResult 2014-10-04 16:01:59 +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
Dominik Schürmann
a29d6b0ef3 Import code, fix collision of key spinner with other loaders 2014-10-04 15:42:23 +02:00
Vincent Breitmoser
0e0e3d8dd0 redesign certify action to work with parcel input and result 2014-10-04 15:19:43 +02:00
Vincent Breitmoser
ba018d1f1b yubikey: check with correct subkey id for sign operation 2014-10-04 15:13:38 +02:00
Dominik Schürmann
f0ee7ed4cf New add keys activity 2014-10-04 13:44:34 +02:00
Vincent Breitmoser
dcd22d9815 keychainintentservice: rearrange actions in alphabetical order 2014-10-04 12:31:05 +02:00
Vincent Breitmoser
ff144c7c11 canonicalize: compare user ids as string rather than bytes 2014-10-04 11:14:02 +02:00
Vincent Breitmoser
2b5341f0d4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-10-03 23:10:37 +02:00
Vincent Breitmoser
f03822fefd fix nullpointer on button push while data is still loading 
fixes #934
 2014-10-03 23:08:32 +02:00
Dominik Schürmann
f6e0d0f495 Make app_name translatable 2014-10-03 18:49:31 +02:00
Dominik Schürmann
628eef2ab0 Version 3.0.1 2014-10-03 18:42:11 +02:00
Dominik Schürmann
3dfef61de5 Fix string reference 2014-10-03 18:42:03 +02:00
Dominik Schürmann
13cd1daaaa Pull from transifex 2014-10-03 18:37:56 +02:00
Dominik Schürmann
0b572e9001 Changelog 2014-10-03 18:31:47 +02:00
Dominik Schürmann
d5c6e430a5 Null check for getSelectedEntries 2014-10-03 13:37:49 +02:00
Vincent Breitmoser
228e5653f9 one more fix for getting the right subkey in api signing 2014-10-03 13:25:25 +02:00
Vincent Breitmoser
1ed6083a24 forgot adjustments in ProviderHelper 2014-10-03 04:42:01 +02:00
Vincent Breitmoser
f456c8a17d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-10-03 04:25:08 +02:00
Vincent Breitmoser
662cc53859 clean up PgpImportExport a bit 2014-10-03 04:25:00 +02:00
Vincent Breitmoser
00bbf8c267 move IteratorWithSize interface into ParcelableFileCache - much cleaner 2014-10-03 04:22:32 +02:00
Vincent Breitmoser
504064302b actually use iterator interface for ParcelableFileCache in activities 2014-10-03 04:16:14 +02:00
Vincent Breitmoser
04c8d42436 get rid of two consolidate number preferences 2014-10-03 03:37:08 +02:00
Vincent Breitmoser
a91468565f use iterator interface exclusively in ParcelableFileCache 2014-10-03 03:29:23 +02:00
Dominik Schürmann
4cfc7feb43 More beautifyKeyIdWithPrefix 2014-10-03 03:16:34 +02:00
Dominik Schürmann
ef7eab2c8b Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
 2014-10-03 02:20:38 +02:00
Dominik Schürmann
b9dc21969f Fix nullpointer with clipboard 2014-10-03 02:17:51 +02:00
Vincent Breitmoser
4b4e885e55 more getActivity() checks 2014-10-03 02:13:22 +02:00
Vincent Breitmoser
34e4dabea9 fix nullpointer with subtle attention seeker 2014-10-03 02:07:09 +02:00
Vincent Breitmoser
08bfc2ae73 fix hideKeyboard() in other activities as well, just to be safe 2014-10-02 19:40:43 +02:00
Vincent Breitmoser
a361e82a4d fix NullPointerException in keyboard hack 2014-10-02 19:35:03 +02:00
Vincent Breitmoser
37cb5c4c78 make getSignId a secret key operation, and respect unavailable keys 
This one should remedy #811, but waiting for a test
 2014-10-02 19:26:07 +02:00
Dominik Schürmann
9a296c012d Version 3.0 2014-10-02 14:22:06 +02:00
Dominik Schürmann
8192bf99a6 mProgressDialogFragment null check 2014-10-02 14:05:54 +02:00
Dominik Schürmann
c2f85c7446 Remove unnecessary call to mFingerprintQrCode 2014-10-02 12:50:38 +02:00
Dominik Schürmann
6da367e469 Fix IllegalStateException in ViewKeyShareFragment 2014-10-02 12:43:18 +02:00
Dominik Schürmann
a125b51b1c Fix nullpointer with getS2K() 2014-10-02 12:33:56 +02:00
Dominik Schürmann
675d2bd6dd code style 2014-10-02 11:47:42 +02:00
Dominik Schürmann
8f616bcf0c Add null check when retrieving key ids from contacts api 2014-10-02 11:32:10 +02:00
Dominik Schürmann
17e45d94a8 Add workaround for bug #912 2014-10-02 11:23:43 +02:00
Dominik Schürmann
42ce3bb0d3 Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen 2014-10-01 15:03:53 +02:00
Dominik Schürmann
e7cbf975ac More debugging output 2014-10-01 14:14:50 +02:00
Dominik Schürmann
f841203f5f Add filterTouchesWhenObscured to prevent Touch-Event Hijacking 2014-10-01 10:51:02 +02:00
Dominik Schürmann
84fcbba74d check key ids when used from api 2014-10-01 10:48:28 +02:00
Dominik Schürmann
e1a81ae5cd Update from transifex 2014-09-30 20:00:14 +02:00
Dominik Schürmann
cce2365173 Clarify api_create_account_text 2014-09-30 19:55:30 +02:00
Dominik Schürmann
b1b16b9313 3.0 beta3 2014-09-30 17:50:16 +02:00
Vincent Breitmoser
51ecce510f fix minor logic error (haha) 2014-09-30 14:10:54 +02:00
Vincent Breitmoser
354bc87579 fix ByteBuffer offset mistake in NfcActivity 2014-09-30 11:36:51 +02:00
Vincent Breitmoser
b2b19d7b2b pass (encryption) key id from Decrypt*Fragment to NfcActivity 2014-09-30 02:14:28 +02:00
Vincent Breitmoser
11d0f4510b pass key id for check from EncryptActivity to NfcActivity 2014-09-30 02:03:17 +02:00
Vincent Breitmoser
bd3f6a22cb add (optional) keyId check in NfcActivity 2014-09-30 01:47:04 +02:00
Vincent Breitmoser
dabdda36cf revamp fingerprint and keyid methods in NfcActivity 2014-09-30 01:46:16 +02:00
Vincent Breitmoser
de5dd482e1 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-30 00:51:58 +02:00
Vincent Breitmoser
384724f9b5 request passphrase for correct subkey in OpenPgpService 
fixes #811, hopefully
 2014-09-30 00:51:25 +02:00
Dominik Schürmann
9e7c9a0d32 Fix nullpointer in DecryptActivity 2014-09-29 23:05:17 +02:00
Dominik Schürmann
7531106565 3.0 beta2 2014-09-29 22:54:36 +02:00
Dominik Schürmann
f275daf1fb Disable NfcIntentActivity until we implement it properly 2014-09-29 22:54:17 +02:00
Dominik Schürmann
43140c10b1 Fixes for share to decrypt 2014-09-29 22:52:03 +02:00
Dominik Schürmann
8e5c5c9503 Remove unused layouts 2014-09-29 22:24:55 +02:00
Dominik Schürmann
51ea71d68a Maybe fixes encrypt files on tablets 2014-09-29 22:23:48 +02:00
Vincent Breitmoser
0b16a4edfd Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/AndroidManifest.xml
 2014-09-29 21:32:21 +02:00
Vincent Breitmoser
7f547afe42 add barely functional nfc intent activity (WIP!) 2014-09-29 21:31:19 +02:00
Vincent Breitmoser
c13a7b7eae add class for proper nfc tlv packet parsing 2014-09-29 21:22:48 +02:00
Dominik Schürmann
f7fe236bd5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-29 21:20:30 +02:00
Dominik Schürmann
654d98ac2a Fix NfcActivity task stack problem 2014-09-29 21:20:01 +02:00
Vincent Breitmoser
c34a159cae fix method visibility for tests 2014-09-28 15:17:09 +02:00
Vincent Breitmoser
8131daa638 move can.*() methods to CanonicalizedPublicKey, where they belong 2014-09-28 14:50:52 +02:00
Vincent Breitmoser
706e60474d be more mindful of algorithm and usage flag interaction 
Fixes #895
 2014-09-28 14:25:54 +02:00
Vincent Breitmoser
c0abae5cc3 only check for primary binding certificate if key algorithm even supports signing 2014-09-28 03:53:14 +02:00
Vincent Breitmoser
4782d22e26 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-28 03:38:14 +02:00
Vincent Breitmoser
1c3d0a58ea Reject subkeys with no key flags and no primary key binding certificate 
Closes #899
 2014-09-28 03:34:25 +02:00
Dominik Schürmann
d20f657151 Hide keyboard after cloud search 2014-09-27 14:36:14 +02:00
Dominik Schürmann
f22bbbd96c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-27 13:52:05 +02:00
Dominik Schürmann
1a7edc9925 Dont show keyboard by default in key creation to allow the user to get an overview what to type, use spannable where possible 2014-09-27 13:52:01 +02:00
Vincent Breitmoser
1a2ec1eb32 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-26 00:43:08 +02:00
Vincent Breitmoser
4ccb26d2e5 nfc: use proper hex encoding for pin length 
Fixes #886
 2014-09-26 00:39:48 +02:00
Tim Bray
6d70e1bfd1 Fix bug where Keybase extraData gets lost when SKS wins the search race. 2014-09-25 02:30:52 -07:00
Dominik Schürmann
999094934a Fixes for new app list 2014-09-24 21:30:03 +02:00
Dominik Schürmann
d5a1e9bb66 3.0 beta1 2014-09-24 19:11:23 +02:00
Vincent Breitmoser
f48db5a005 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:41:16 +02:00
Vincent Breitmoser
9e2fc81c65 disable pull to refresh (for now) 2014-09-24 15:41:08 +02:00
Dominik Schürmann
8b663add04 Pull from transifex 2014-09-24 15:41:00 +02:00
Vincent Breitmoser
312598290b fix save button when no file is selected 2014-09-24 15:36:34 +02:00
Vincent Breitmoser
a50fe142e4 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 15:31:37 +02:00
Vincent Breitmoser
7c6eff6d92 show message about saving multiple files rather than hide the button 2014-09-24 15:28:51 +02:00
Vincent Breitmoser
689b2c9ab1 move more stuff into EncryptActivity superclass 2014-09-24 15:18:00 +02:00
Vincent Breitmoser
e0da0f6eb5 use correct pin for nfc in EncryptActivity 2014-09-24 15:04:23 +02:00
Dominik Schürmann
9dbb966b44 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 14:46:03 +02:00
Dominik Schürmann
e3a185f698 propose apps in apps list 2014-09-24 14:45:51 +02:00
Vincent Breitmoser
c7b0f77c9b allow 1024 bit key signatures 2014-09-24 14:14:16 +02:00
Vincent Breitmoser
da66d1443f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 12:30:15 +02:00
Vincent Breitmoser
e4a7414794 fix Le fields in APDUs 2014-09-24 12:30:07 +02:00
Dominik Schürmann
5b0cc1fab4 Fix logging in NFcActivity 2014-09-24 11:57:50 +02:00
Vincent Breitmoser
5604deaca0 Fix yubikey pin lengths other than 6 
Closes #883
 2014-09-24 02:58:38 +02:00
Vincent Breitmoser
425cea41f2 add subtle attention seeker to decryptactivity with available clipboard data 
Thanks Cyril Mottier

https://plus.google.com/+CyrilMottier/posts/FABaJhRMCuy
 2014-09-24 02:43:45 +02:00
Dominik Schürmann
382ae968d6 Fix strings reported by yahoe.001 2014-09-24 02:36:24 +02:00
Dominik Schürmann
c3e0b3e887 Fix NfcActivity typo 2014-09-24 02:11:41 +02:00
Dominik Schürmann
b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann
f7d49a48cb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-24 01:49:50 +02:00
Dominik Schürmann
3850ddea08 DecryptFiles: Reset state for new file decrytion 2014-09-24 01:46:54 +02:00
Vincent Breitmoser
c871891f49 Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
 2014-09-24 01:42:17 +02:00
Vincent Breitmoser
7654cd54fb fix signing in OK with yubikeys 2014-09-24 01:41:40 +02:00
Dominik Schürmann
6e0938aa93 Fix new decrypt button 2014-09-24 01:41:38 +02:00
Dominik Schürmann
993046d12e cleanup 2014-09-24 01:38:18 +02:00
Vincent Breitmoser
d588b13255 fix signatures produced by yubikey 
The timestamp was only set on a second run. This led to a race
condition whether the signature could be completed within the
same timestamp.

Fixes #834
 2014-09-24 01:37:28 +02:00
Dominik Schürmann
42a7cd5eb0 Button text for decrypt 2014-09-24 01:37:00 +02:00
Dominik Schürmann
7f2640711e Fix yubikey file decryption 2014-09-24 01:18:14 +02:00
Dominik Schürmann
0182f7c951 Yubikey text decryption working 2014-09-24 00:57:57 +02:00
Dominik Schürmann
07704c2726 Yubikey decryption 2014-09-24 00:50:58 +02:00
Dominik Schürmann
7c82e1c728 DecryptFilesActivity 2014-09-24 00:02:00 +02:00
Vincent Breitmoser
07e8729abf fix nullpointer in previous swipetorefresh fix 2014-09-23 23:49:18 +02:00
Dominik Schürmann
0143b54e9e Implement buttons in DecryptTextFragment 2014-09-23 23:38:30 +02:00
Dominik Schürmann
b9347ea9aa Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-23 23:04:27 +02:00
Dominik Schürmann
9f67b0fe54 DecryptTextActivity rework 2014-09-23 23:04:18 +02:00
Vincent Breitmoser
ab4972b428 missed a secondary preference initialization 2014-09-23 19:17:54 +02:00
Vincent Breitmoser
5e090e6fb6 fix nullpointer ImportKeysListEntry (from pulltorefresh) 
Fixes #873
 2014-09-23 19:02:08 +02:00
Vincent Breitmoser
45b7b88b94 disable pull to refresh in upper right corner 
While at the top of the list, the scroll bar handle is in the top right
corner. Previously, dragging the handle from this position was difficult
because touch events were intercepted by the pull to refresh handler.

Closes #858
 2014-09-23 18:48:39 +02:00
Vincent Breitmoser
c5239d6e9b be more precise on importresult overall error 2014-09-23 16:23:13 +02:00
Vincent Breitmoser
da1779816b take failed keys into account in importkeyresult notification 2014-09-23 16:19:01 +02:00
Vincent Breitmoser
070017b12f passphrasecache: cache by master key, introduce preference for cache by subkey 2014-09-23 15:56:48 +02:00
Vincent Breitmoser
9d9d71f3db reject keys with duplicate subkeys altogether 
closes #870
 2014-09-23 01:36:46 +02:00
Vincent Breitmoser
3759d74ac8 add test case for duplicate keys in keyring (#870) 2014-09-23 01:32:36 +02:00
Vincent Breitmoser
862c9a8b3c log "unspecified" flags differently 2014-09-22 17:02:53 +02:00
Vincent Breitmoser
f6ac887ce0 nicer code in key import for flag log types 2014-09-22 16:47:29 +02:00
Vincent Breitmoser
029ce91670 show authenticate flag in logs 2014-09-22 16:27:42 +02:00
Dominik Schürmann
d63fabace7 Hack to fix #805 2014-09-22 00:10:55 +02:00
Dominik Schürmann
fc4cdaa24b Fix possible nullpointer in ImportKeysFileFragment 2014-09-21 23:25:41 +02:00
Dominik Schürmann
db7da6525e Fix custom key configuration for primary user ids 2014-09-21 23:19:21 +02:00
Dominik Schürmann
f50c0e1905 Fix LogDisplayFragment 2014-09-21 22:56:16 +02:00
Dominik Schürmann
65c3d69d9a Fix ConsolidateResult, needed parcelable methods 2014-09-21 22:31:28 +02:00
Dominik Schürmann
1dd68c7120 Merge pull request #871 from timbray/master 
Handle absence of personal information in Keybase search result
 2014-09-21 21:48:13 +02:00
Dominik Schürmann
bf0104af2e Feature to change key configuration in create key 2014-09-21 21:50:56 +02:00
Tim Bray
edf87d09cb Handle absence of personal information in Keybase search result 2014-09-21 10:24:48 -07:00
Dominik Schürmann
d4387c0179 Add null check to getSecretKeyType 2014-09-21 18:27:03 +02:00
Dominik Schürmann
1f5f937d00 Small UI fixes 2014-09-21 18:10:51 +02:00
Dominik Schürmann
9bd3383b49 Merge user ids in import list for better display 2014-09-21 17:58:26 +02:00
Dominik Schürmann
1d38365a61 key spinner fixes 2014-09-21 12:03:25 +02:00
Dominik Schürmann
08ad0cb305 settings code cleanup 2014-09-21 11:02:29 +02:00
Dominik Schürmann
b06fe773cf New key flags icons, subkey adapter redesign, support authanticate flag in database 2014-09-20 20:36:37 +02:00
Dominik Schürmann
da4a70c513 no monospace for key ids 2014-09-20 18:12:13 +02:00
Vincent Breitmoser
6062b5ef68 fix isLocal logic (f*ck yeah unit tests!) 2014-09-20 00:32:50 +02:00
Vincent Breitmoser
344bc1736d respect user id revocation signatures 
Closes #836
 2014-09-20 00:14:33 +02:00
Vincent Breitmoser
6536ca825b forgot a LogLevel piece 2014-09-19 21:40:45 +02:00
Dominik Schürmann
1ad36e2dbd Beautify key id (thanks to Tim Bray) 2014-09-19 13:44:17 +02:00
Dominik Schürmann
99bf77dd84 Remove certificate validation code from ViewCertActivity, they are already validated by import 2014-09-19 11:46:21 +02:00
Dominik Schürmann
a454bfd701 Use key icons in import, prettify items 2014-09-18 22:05:27 +02:00
Dominik Schürmann
a77c217b82 Fixes for nfc decrypt 2014-09-18 15:28:51 +02:00
Dominik Schürmann
1837dc89fa Fix nfc signing 2014-09-18 14:54:25 +02:00
Dominik Schürmann
4dec8b2b76 Stop refreshing after all keys have been updated 2014-09-18 14:41:24 +02:00
Dominik Schürmann
e019752a28 Swipe-to-refresh fixes 2014-09-18 14:03:21 +02:00
Dominik Schürmann
ac66f6cc10 Swipe-to-refresh fixes 2014-09-18 13:55:23 +02:00
Dominik Schürmann
91e97d03a1 Fix sign via API 2014-09-18 13:19:57 +02:00
Dominik Schürmann
9586d6b9b8 Use key icons in spinners 2014-09-17 23:06:49 +02:00
Dominik Schürmann
b09d222f34 package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting 2014-09-17 21:51:25 +02:00
Dominik Schürmann
a139be29ba PassphraseDialogActivity usage in Remote API 2014-09-17 21:36:38 +02:00
Dominik Schürmann
7d917fa39c Fix cleartext verify 2014-09-17 21:26:08 +02:00
Dominik Schürmann
1abf167f80 Passphrase handling in encrypt 2014-09-17 20:40:02 +02:00
Dominik Schürmann
8724916866 Result parcel refactorings (WIP) 2014-09-17 15:08:02 +02:00
Vincent Breitmoser
a3e7406b3d fix encrypt/decrypt classes 2014-09-17 14:32:14 +02:00
Dominik Schürmann
27cc92cbef Dont copy encrypted file to clipboard (dont know how that code ended up there) 2014-09-17 14:00:11 +02:00
Dominik Schürmann
d686c55a0a Work on new result handling (WIP) 2014-09-17 13:45:16 +02:00
Tim Bray
018ca6abad Fix construction of algorithmID in Keybase result lists 2014-09-15 15:11:59 -07:00
Vincent Breitmoser
1f9bbff58d minor fix for passphrase test 2014-09-15 14:17:39 +02:00
Vincent Breitmoser
e457d4c909 Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/res/values-de/strings.xml
 2014-09-15 14:00:17 +02:00
Vincent Breitmoser
9a3a032d99 move LogLevel info into LogType enum 2014-09-15 13:59:21 +02:00
Dominik Schürmann
40751bceb5 Pull from transifex 2014-09-15 10:44:36 +02:00
Dominik Schürmann
943a9c2634 ACCESS_NETWORK_STATE no longer needed 2014-09-15 10:34:04 +02:00
Dominik Schürmann
deddb09c32 Fix build 2014-09-15 10:33:15 +02:00
Dominik Schürmann
67e572cf4f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-15 10:20:01 +02:00
Dominik Schürmann
53bc417f8f New decrypt activity design (WIP), saner UTF8 decoding (replacing non-decodable characters) 2014-09-15 10:19:55 +02:00
Tim Bray
d1a26c5748 update for new plural origins on ImportKeyListEntry 2014-09-13 21:55:41 -07:00
Tim Bray
c13ccda658 Keys found on multiple servers are now imported from all of them 2014-09-13 21:43:07 -07:00
Tim Bray
7de86a09bc Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that 2014-09-13 21:41:03 -07:00
Tim Bray
e14cf32264 Restore Yubikey setting, lost in fumble-fingered merge 2014-09-13 21:41:03 -07:00
Tim Bray
1c32d1df88 Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs 2014-09-13 21:41:03 -07:00
Vincent Breitmoser
36ef8a9a62 work on OperationResultParcel 2014-09-14 01:14:58 +02:00
Dominik Schürmann
88bbce831c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-14 00:56:03 +02:00
Vincent Breitmoser
03d103af07 pending results are a type of non-success 2014-09-14 00:55:50 +02:00
Vincent Breitmoser
760b05273c (forgot a file for previous commit) 2014-09-14 00:43:07 +02:00
Vincent Breitmoser
f0e159a372 add SignEncryptResult parcel (probably break stuff) 2014-09-14 00:33:30 +02:00
Dominik Schürmann
db5d12800c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-14 00:11:28 +02:00
Dominik Schürmann
179f48a4de First work on decrypt 2014-09-14 00:11:23 +02:00
Daniel Albert
0625a16cb5 Temporary fix for #848, fixed pull2refresh bugs 2014-09-13 23:57:54 +02:00
Dominik Schürmann
d5c9021b89 Hack to disable overscroll effect of swipe to update 2014-09-13 23:08:04 +02:00
Dominik Schürmann
efdfd2544d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 22:55:32 +02:00
Dominik Schürmann
c9fee47fb3 Custom actionbar to indicate swipe down effect 2014-09-13 22:55:27 +02:00
Vincent Breitmoser
85d0f5b6d5 add key id to trailing asym data log msg 2014-09-13 22:27:22 +02:00
Vincent Breitmoser
e2675caf23 just skip foreign uid certifications during import for now 
Related to #836, fix still pending
 2014-09-13 22:16:35 +02:00
Vincent Breitmoser
9475c4d91a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 22:09:12 +02:00
Vincent Breitmoser
ff65733ed3 move IS_REVOKED table prefix to the right places 
Fixes #849
 2014-09-13 22:08:53 +02:00
Dominik Schürmann
bcbf96e61b Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 22:02:11 +02:00
Dominik Schürmann
b67b6b7f87 Set literal data format tag to UTF8 when encrypting text 2014-09-13 21:59:47 +02:00
Vincent Breitmoser
3b8c171ecb very small fix, don't show name on encoding warning 2014-09-13 21:47:04 +02:00
Vincent Breitmoser
8a188a79dc log warning on bad uid encoding 2014-09-13 21:43:37 +02:00
Vincent Breitmoser
f8677a5f16 Merge branch 'result-parcels' 2014-09-13 21:32:17 +02:00
Vincent Breitmoser
7b08b18d25 some DecryptVerify log refinements 2014-09-13 21:29:29 +02:00
Dominik Schürmann
a1323a1a14 deactivate screenshots in new PassphraseDialogActivity 2014-09-13 21:17:19 +02:00
Vincent Breitmoser
efd9d1626e add a ton of logging to DecryptVerify 2014-09-13 21:14:06 +02:00
Dominik Schürmann
3bc3bc6d58 More smaller UI fixes 2014-09-13 21:01:47 +02:00
Dominik Schürmann
be4882f5c1 If expired/revoked, disable both encrypt buttons 2014-09-13 20:53:07 +02:00
Dominik Schürmann
143cd2bd13 Test for badly encoded user ids 2014-09-13 20:46:44 +02:00
Dominik Schürmann
a8a1f352a8 Add new PassphraseDialogActivity, a transparent activity that only holds the passphrase dialog 2014-09-13 20:29:08 +02:00
Dominik Schürmann
d73ea5f612 Fix share to encrypt text 2014-09-13 20:07:22 +02:00
Dominik Schürmann
7d41800e57 Use spannable directly instead of html conversion in SubkeysAdapter 2014-09-13 19:49:16 +02:00
Dominik Schürmann
cbed39c38c Remove unused method in KeyUpdateHelper 2014-09-13 19:35:01 +02:00
Vincent Breitmoser
dbbefe2f41 working version of DecryptVerifyResult 2014-09-13 19:30:10 +02:00
Dominik Schürmann
a41b9f08d0 Merge pull request #843 from da-kid/master 
Implemented Pull2Refresh
 2014-09-13 19:10:54 +02:00
Dominik Schürmann
9e37522bdd Get certificates by raw user ids, be more liberal about accepted user id encodings 2014-09-13 19:05:53 +02:00
Vincent Breitmoser
4c636a1471 introduce OperationResultParcel for PgpDecryptVerify operations (WIP) 2014-09-13 17:54:10 +02:00
Dominik Schürmann
974dc47d69 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 17:30:14 +02:00
Dominik Schürmann
aca9ecdb85 getSignaturesForID can return null, check this 2014-09-13 17:30:07 +02:00
Daniel Albert
a86ec573fa Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers 2014-09-13 17:02:10 +02:00
Vincent Breitmoser
19252380f1 promote all result parcels to top level classes in their own package 2014-09-13 14:36:23 +02:00
Daniel Albert
fd5e5afc9f Implemented Pull2Refresh in the KeyListFragment 
Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection
Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs
Added Pull2Refresh to the KeyListFragment
 2014-09-12 22:44:45 +02:00
Vincent Breitmoser
40c81c9429 fix key upload after certification (hopefully?) 2014-09-12 11:55:14 +02:00
Vincent Breitmoser
4e834d7833 add ui support for stripping subkeys 2014-09-11 22:50:44 +02:00
Vincent Breitmoser
f744488017 editKey: add support for sripping keys 2014-09-11 22:49:21 +02:00
Vincent Breitmoser
2a6774b221 merge: add support for s2k dummy generation 
if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.
 2014-09-11 22:45:35 +02:00
Dominik Schürmann
51d6ad4394 nullpointer check in KeychainProvider 2014-09-11 13:16:35 +02:00
Dominik Schürmann
6eb715a5d9 nullpointer check in KeychainProvider 2014-09-11 13:13:35 +02:00
Dominik Schürmann
f18a8a20ac Add newly discussed design decisions for passphrase cache service 2014-09-10 13:40:51 +02:00
Vincent Breitmoser
d61d846b72 add some comments to previous commit 2014-09-10 01:04:13 +02:00
Vincent Breitmoser
7dbb7cf1e1 jury-rig broken sign mechanism 
Should improve situation on #811
 2014-09-09 22:43:14 +02:00
Dominik Schürmann
a925e8b83f Version 2.9.2 2014-09-09 09:40:59 +02:00
Dominik Schürmann
c40d105574 Changelog 2.9.2 2014-09-09 09:37:46 +02:00
Dominik Schürmann
5593d4cc78 Increase s2k count to 0x90 2014-09-09 09:35:18 +02:00
Dominik Schürmann
7c67f7a715 Consolidate on database upgrade 2014-09-09 09:26:03 +02:00
Dominik Schürmann
eecf4f655b Unify package name 2014-09-08 22:34:43 +02:00
Dominik Schürmann
1c06dd43cf Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-08 15:12:02 +02:00
Dominik Schürmann
0d40d5999b Fix changelog versioning 2014-09-08 15:11:54 +02:00
Vincent Breitmoser
ceea2667e8 introduce SingletonResult for... singleton results 2014-09-08 14:50:16 +02:00
Dominik Schürmann
9eed414a77 Dont make portrait a requirement 2014-09-08 14:37:11 +02:00
Vincent Breitmoser
055fb59ec3 Properly handle uneditable key types in EditKeyFragment 
More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.

part of #828
 2014-09-08 14:35:15 +02:00
Dominik Schürmann
38101d1fc7 Version 2.9.1 2014-09-08 14:31:14 +02:00
Dominik Schürmann
980674b322 Pull from transifex 2014-09-08 14:26:10 +02:00
Dominik Schürmann
fcd4be5ba0 Changelog 2.10 2014-09-08 14:22:29 +02:00
Dominik Schürmann
9eb65601c4 Revert changes in DecryptFileFragment 2014-09-08 14:10:45 +02:00
Dominik Schürmann
518d7116e2 Work on Yubikey decryption 2014-09-08 14:04:46 +02:00
Dominik Schürmann
8ab2491645 Make preferences safe across multiple processes 2014-09-08 11:30:31 +02:00
Dominik Schürmann
f4592c8b95 Yubikey: use PIN 2014-09-08 00:40:50 +02:00
Dominik Schürmann
7ccd30b78e Fix signature timestamp in API 2014-09-08 00:17:13 +02:00
Dominik Schürmann
83af19de20 Prepare Yubikey decryption 2014-09-08 00:01:29 +02:00
Dominik Schürmann
fd7f187364 Fix yubikey for signAndEncrypt via API 2014-09-07 23:19:55 +02:00
Dominik Schürmann
e6e70ec7d9 remove send umltiple from text API 2014-09-07 22:58:00 +02:00
Dominik Schürmann
605e37f089 Dont show key_unavailable on pub keys 2014-09-07 22:06:37 +02:00
Dominik Schürmann
afc20602eb Fix problems in strings.xml 2014-09-07 21:59:57 +02:00
Dominik Schürmann
bb0d04de82 Fix for user ids in API 2014-09-07 20:09:36 +02:00
Dominik Schürmann
4c2419642b Remove SelectSecretKey, not used anymore 2014-09-07 19:18:19 +02:00
Dominik Schürmann
6c3f6dc74a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 19:01:28 +02:00
Dominik Schürmann
ef30d842d8 API fixes 2014-09-07 18:59:56 +02:00
Dominik Schürmann
857fc43873 Update and fix Intent API 2014-09-07 18:50:58 +02:00
Vincent Breitmoser
0b091aa642 flag revoked, epired and unavailable keys in selection spinner 2014-09-07 18:49:29 +02:00
Dominik Schürmann
65a0a0e34f Make Intent API as recommended in http://developer.android.com/guide/components/intents-filters.html 2014-09-07 18:26:43 +02:00
Dominik Schürmann
d172058150 Due to compatiblity switch from SHA512 to SHA256 2014-09-07 17:58:28 +02:00
Dominik Schürmann
c026dac8fc Remove table layout, use hint text for edit fields 2014-09-07 17:27:25 +02:00
Dominik Schürmann
1f477c8059 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 17:09:54 +02:00
Dominik Schürmann
94a47719ae Put quotes around all strings, should fix transifex consistency problems, also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes) 2014-09-07 17:09:46 +02:00
Vincent Breitmoser
597eb268f4 add error text on bad passphrase 2014-09-07 17:04:13 +02:00
Dominik Schürmann
3ba2e0b0c1 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 17:01:07 +02:00
Dominik Schürmann
d1e08f9305 Two buttons to encrypt files and text, some fixes 2014-09-07 17:00:58 +02:00
Vincent Breitmoser
31cc004fe1 make EditKeyFragment work with new PassphraseDialog 2014-09-07 16:55:07 +02:00
Vincent Breitmoser
fd7bdbf54f add proper async check for correct passphrase to passphrasedialog 2014-09-07 16:54:39 +02:00
Dominik Schürmann
02663de191 Better symmetric encryption layout 2014-09-07 16:14:48 +02:00
Dominik Schürmann
27772d401c Save account on back press and with notify 2014-09-07 16:10:28 +02:00
Dominik Schürmann
0e83df21cf More UI rework 2014-09-07 15:30:32 +02:00
Dominik Schürmann
0706005732 Fix width for encrypt to 2014-09-07 11:52:02 +02:00
Dominik Schürmann
0d1c9f7745 Remove file menu items from text activity 2014-09-06 18:06:48 +02:00
Dominik Schürmann
05a29a1f8f No inception with APG 2014-09-06 18:05:06 +02:00
Dominik Schürmann
cc14119425 Fix AndroidManifest for new encrypt activities 2014-09-06 17:55:19 +02:00
Dominik Schürmann
f2f1a9516d Share helper 2014-09-06 17:39:00 +02:00
Dominik Schürmann
59f32c4fca Drawer nav method cleanup 2014-09-06 16:36:58 +02:00
Dominik Schürmann
30978384af Remove unused gmail clearup method 2014-09-06 16:28:31 +02:00
Dominik Schürmann
6e3973e26a Add experimental support for yubikey PINs, remove caching of empty passphrases 2014-09-05 20:04:07 +02:00
Dominik Schürmann
fa9bbdd60c Add yubikey default PIN preference 2014-09-05 19:40:04 +02:00
Dominik Schürmann
2a9b083012 Safeslinger: icon, about info 2014-09-04 21:12:25 +02:00
Dominik Schürmann
8cf4e25320 Safeslinger: more simplification 2014-09-04 14:59:39 +02:00
Dominik Schürmann
7b51718c92 Safeslinger: cleanup 2014-09-04 14:56:30 +02:00
Dominik Schürmann
b1c3bfa157 Safeslinger: get all bytes 2014-09-04 14:34:59 +02:00
Dominik Schürmann
4872fd5b2d Use bytes to share via safeslinger, import on result 2014-09-04 13:44:01 +02:00
Dominik Schürmann
d0f46f1efb Integrate safeslinger share 2014-09-04 12:54:16 +02:00
Dominik Schürmann
10e96dff43 Add safeslinger to build 2014-09-04 11:30:36 +02:00
Dominik Schürmann
46d45ebd67 Fix mAllowedKeyIds 2014-09-03 18:05:30 +02:00
Vincent Breitmoser
7bc424a8cb work on passphrase caching, make use of cached SecretKeyType data (WIP!) 2014-09-03 02:43:06 +02:00
Vincent Breitmoser
e9b14585f5 add getSecretKeyType method to CachedPublicKeyRing 2014-09-03 02:43:06 +02:00