cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,344 Commits 1 Branch 0 Tags
148c9a5c621376b606b6daaae4acf3329b2fcc2e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Vincent Breitmoser 108b35cb50 add description of symantec test case 2014-10-26 00:41:36 +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
Vincent Breitmoser 33738b1f52 Retry canonicalization with pubkey self certs if first attempt failed 
Fixes #974
 2014-10-26 00:26:13 +02:00
Vincent Breitmoser b9c0504465 remove unnecessary (and buggy) BufferedInputStream wrapping 2014-10-25 22:20:55 +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
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
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
Vincent Breitmoser b6c7231a7f some cleanup and documentation of *Operation classes 2014-10-15 16:57:23 +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
Vincent Breitmoser 40850b933b actually remove filter spinner code. that's what git is for~ 2014-10-13 16:43:17 +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
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
Vincent Breitmoser f6d0347c79 rename certify_key_item to the more appropriate multi_certify_item 2014-10-08 22:47:30 +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
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
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
Vincent Breitmoser 7fedde2638 add support for hierarchical log entries 2014-10-05 10:09:50 +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
Vincent Breitmoser 48c843beae even more layout neatification 2014-10-05 02:15:43 +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
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
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
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 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
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 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
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
Vincent Breitmoser dcd22d9815 keychainintentservice: rearrange actions in alphabetical order 2014-10-04 12:31:05 +02:00
Vincent Breitmoser c30c36fb2a add unit test for duplicate user ids (fix later!!) 2014-10-04 11:49:46 +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
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 5d6c2d90c2 fix unit test for ParcelableFileCache 2014-10-03 04:31:09 +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