cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,171 Commits 1 Branch 0 Tags
e03e1e5cfcc19b3898b3a6397f2d429c7779d343
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser e03e1e5cfc fix nullpointer in encrypttextactivity. fixes #1267 2015-05-28 16:33:44 +02:00
Vincent Breitmoser 6e3ed1d2db do nfc dispatching in MainActivity 2015-05-28 16:33:14 +02:00
Vincent Breitmoser f30900d085 add user id flags to UserAttribute self signatures 2015-05-20 12:47:23 +02:00
Vincent Breitmoser b62ad4d79c check fingerprint length after scanning qr code 
Fixes #1281
 2015-05-17 10:36:30 +02:00
Vincent Breitmoser fb96b6dfa9 open ViewKeyActivity by subkey in NfcBaseActivity 2015-05-17 02:14:27 +02:00
Vincent Breitmoser a79d7bd1c2 simplify MainActivity and fix backstack issues 2015-05-17 02:13:51 +02:00
Vincent Breitmoser 3a27a28c0a re-parcel log in LogDisplayFragment 2015-05-17 01:13:41 +02:00
Vincent Breitmoser 765990ed13 fingerprints are 20 bytes, not 40. duh. 2015-05-17 01:04:34 +02:00
Vincent Breitmoser 9a6f581400 load yubikey fragment after mMasterKeyId is available 2015-05-17 01:04:32 +02:00
Vincent Breitmoser 158263f255 apply promote operation to specific subkeys present on yubikey only 2015-05-17 01:04:31 +02:00
Vincent Breitmoser 71818934ca pass masterKeyId to yubikey fragment 2015-05-17 01:04:27 +02:00
Vincent Breitmoser f6643962af allow state loss when yubikey fragment is loaded 2015-05-17 01:04:25 +02:00
Vincent Breitmoser d06ae7f691 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-05-17 01:04:22 +02:00
Vincent Breitmoser b509c3ed39 fix fragment handling in ViewKeyActivity 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-05-17 01:04:19 +02:00
Vincent Breitmoser 91d500b20d check for fingerprint of any subkey (arguable?) 2015-05-06 11:26:01 +02:00
Vincent Breitmoser 3f1fa4d95c Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-28 18:22:42 +02:00
Vincent Breitmoser 8ab49b0766 fix crash when moving focus from EncryptKeyCompletionView with unknown text 2015-04-28 18:22:26 +02:00
Vincent Breitmoser cd55871950 display unknown keys red rather than orange 
For an unknown key, there is no indication of the state the key is in.
To indicate both immediate action required, and to make this status
equal to its worst case (rather than *better* than its worst case), the
status is displayed in red.

At some point, we will probably want to download unknown keys
automatically, at which point an unknown key will actually be an error
state. This is an intermediate solution until then.
 2015-04-28 18:22:24 +02:00
Vincent Breitmoser 8717642198 fix "select all" in key list multi-select 2015-04-28 18:22:21 +02:00
Vincent Breitmoser 91b774d223 prevent crashes in EncryptKeyCompletionView 2015-04-27 19:49:54 +02:00
Vincent Breitmoser 4ba2e4bcdd display creation dates for ambiguous user ids 2015-04-27 17:46:10 +02:00
Vincent Breitmoser 40834d1fcd add distinct status for messages signed by "your" key 2015-04-27 17:46:07 +02:00
Vincent Breitmoser 8dbb82a8b6 profiling says: caching qrCode bitmaps is a good idea 2015-04-27 13:52:38 +02:00
Vincent Breitmoser 9c174ff71d fix encrypt activity layout 2015-04-24 19:17:08 +02:00
Vincent Breitmoser 96853a15ee revamp decrypt ui 2015-04-24 19:17:05 +02:00
Vincent a658d3c1e1 Merge pull request #1210 from josecastillo/development 
Maintain client-side state for PIN verification operations
 2015-04-21 10:28:16 +02:00
Vincent Breitmoser ac3efb8b58 fix PgpEncryptDecryptTest for CryptoInputParcel 2015-04-01 01:24:17 +02:00
Vincent Breitmoser ad69622b69 fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) 2015-04-01 00:39:32 +02:00
Vincent Breitmoser 8bd8267a47 work on passphrase data flow 2015-03-31 00:28:24 +02:00
Vincent Breitmoser 6cc7b6141a update OpenPgpApi, re-add EXTRA_PASSPHRASE 2015-03-30 23:56:09 +02:00
Vincent Breitmoser 19ecd5f427 Merge branch 'v/crypto-input-parcel' of github.com:open-keychain/open-keychain into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
 2015-03-30 23:42:38 +02:00
Vincent Breitmoser b0a51e7dd3 remove unused NfcActivity 2015-03-30 23:39:36 +02:00
Vincent Breitmoser 39b131c7e5 fix Encrypt* with RequiredInputParcel 2015-03-30 23:35:32 +02:00
Vincent Breitmoser d7b79e55fb pass CryptoInputParcel independently for SignEncryptOperation 2015-03-30 16:40:41 +02:00
Vincent Breitmoser dcaac4f85f rewrite EncryptKeyCompletionView with generalized KeyAdapter 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
 2015-03-30 02:45:49 +02:00
Vincent Breitmoser c694d73cab further improve yubikey error handling 2015-03-23 01:48:44 +01:00
Vincent Breitmoser 3bb194fc08 nicer handling of nfc errors 2015-03-23 01:09:39 +01:00
Vincent Breitmoser 5227b45af8 Merge branch 'development' into v/crypto-input-parcel 2015-03-22 22:21:19 +01:00
Vincent Breitmoser 8b4388e1a2 use top line in snackbar for status indication 2015-03-22 16:55:46 +01:00
Vincent Breitmoser b2365fcb97 forgot spongycastle update 2015-03-22 07:33:41 +01:00
Vincent Breitmoser 5d5e06cabd fix unit test and add new for divert-to-card promotion 2015-03-22 07:21:27 +01:00
Vincent Breitmoser 2e838e4cce enable nfc in import dialog as well 2015-03-22 06:48:33 +01:00
Vincent Breitmoser 212bba1869 finish ui flow for yubikey import 2015-03-22 06:36:27 +01:00
Vincent Breitmoser 2151411219 actually promote to divert, pass yubikey's AID 2015-03-22 03:58:01 +01:00
Vincent Breitmoser 22063cdd6e improve status reporting in yubikey dialogue 2015-03-22 03:34:34 +01:00
Vincent Breitmoser a7c52a1c9f move yubikey import into viewkeyfragment 2015-03-22 02:36:10 +01:00
Vincent Breitmoser 04c7639a5a split up wait/action yubikey fragments 2015-03-21 22:18:58 +01:00
Vincent Breitmoser 1ad3635d13 work on ad-hoc yubikey import support 2015-03-21 19:52:10 +01:00
Vincent Breitmoser 147003123f first steps toward yubikey activity 
- move BaseActivity into new package
- extract BaseNfcActivity from NfcOperationsActivity
 2015-03-21 17:13:35 +01:00
Vincent Breitmoser 9ef2795fcd Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2015-03-21 15:57:35 +01:00
Vincent Breitmoser 93c7eb72fb more data in RequiredInputParcel, OperationResult notifications 
- pass both masterkeyid and subkeyid though RequiredInputParcel parcel
- fix numeric vales in OperationResult.createNotify()
 2015-03-21 15:16:32 +01:00
Vincent Breitmoser 88ca41d555 add edit key unit test for no-op 2015-03-20 18:55:16 +01:00
Vincent Breitmoser 3e51da3afa fix unit tests (for real) 2015-03-20 18:45:00 +01:00
Vincent Breitmoser e00ce86de9 fix more unit tests (syntax) 2015-03-20 14:57:38 +01:00
Vincent Breitmoser 3fce6d8a12 inline mNfcSignOps variable 2015-03-20 14:22:07 +01:00
Vincent Breitmoser 879efc2c70 fix unit tests (syntax) 2015-03-20 14:21:55 +01:00
Vincent Breitmoser 6cf966b63f re-inline cryptoInput variable 2015-03-20 14:10:00 +01:00
Vincent Breitmoser abce05d529 Merge remote-tracking branch 'origin/development' into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
 2015-03-20 14:01:07 +01:00
Vincent Breitmoser 3b04636f5d support yubikeys in (some) edit key operations 2015-03-20 02:28:22 +01:00
Vincent Breitmoser 25d89b5550 generalize NfcOperationParcel to RequiredInputParcel, including passphrases 2015-03-19 14:21:30 +01:00
Vincent Breitmoser d46fc3740b yubikey certifications! 2015-03-18 21:12:31 +01:00
Vincent Breitmoser aca54e31ea generalize nfc crypto input structure 2015-03-18 18:25:44 +01:00
Vincent Breitmoser 4499caef1e introduce CryptoOperationParcel for nfc data 2015-03-18 14:06:59 +01:00
Vincent Breitmoser db39b779c9 fix expiry of master keys 
fixes #1141
 2015-03-15 19:20:03 +01:00
Vincent Breitmoser 9ff4d7b2bc change user_id primary key in database, use keyring rather than unified query in consolidate 2015-03-11 18:39:26 +01:00
Vincent Breitmoser 4f11fb5a2f unit test certification of user attributes 2015-03-08 01:46:31 +01:00
Vincent Breitmoser 30ca8637ff add support for certification of user attributes 2015-03-08 01:46:30 +01:00
Vincent 443feef27a Merge pull request #1108 from tdjogi010/development 
Asks Passphrase for key delete/export in ViewKeyActivity.
 2015-03-06 11:10:42 +01:00
Vincent c17599f13f Merge pull request #1080 from indrora/avoid-large-log-parcels 
Fix root cause of #1077
 2015-03-04 00:43:48 +01:00
Vincent Breitmoser 7e4c39c79d rescale qr code bitmap in background 2015-03-02 18:44:24 +01:00
Vincent Breitmoser 145e793db1 forgot to rename a method 2015-03-02 18:20:02 +01:00
Vincent Breitmoser bccdae2a40 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-02 18:09:09 +01:00
Vincent Breitmoser 23464e7a89 some cleanup in ViewKey* 2015-03-02 18:09:00 +01:00
Vincent Breitmoser 817afffecc Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-02 17:44:50 +01:00
Vincent Breitmoser 1f828528d3 don't reload qr code for identical fingerprint 2015-03-02 17:43:42 +01:00
Vincent Breitmoser 0846dd2c14 make userattributeadapter superclass of useridsadapter 2015-03-02 17:38:05 +01:00
Vincent Breitmoser 4e29d027af fix a couple lint errors 2015-02-28 17:49:09 +01:00
Vincent Breitmoser 0557e0680e some changes to qr scan logic 2015-02-28 15:58:26 +01:00
Vincent Breitmoser 2ae4d6ce05 pass through messenger to certify service from ViewKeyActivity 
the idea here is to handle progress and result of the CertifyActivity
directly in ViewKeyActivity by passing a messenger through to it. this
allows smoother transition from an uncertified to certified state.
 2015-02-28 04:34:08 +01:00
Vincent Breitmoser f3710b12f6 fab support for all notify types 2015-02-28 02:30:59 +01:00
Vincent Breitmoser e4d91de8d2 small Notify cleanup 2015-02-28 01:37:57 +01:00
Vincent Breitmoser 6ba03c0f13 clean up warnings in KeyListFragment 2015-02-28 01:32:15 +01:00
Vincent Breitmoser cc5b0dae06 collapse fab on action selected 
closes #1057
 2015-02-28 01:31:24 +01:00
Vincent Breitmoser d64b8f47d1 animate FAB to move up and down when a snackbar appears 2015-02-28 01:17:53 +01:00
Vincent Breitmoser 67093ccba2 forgot to commit FabContainer 2015-02-28 00:40:11 +01:00
Vincent Breitmoser 9c62c3fd39 control flow for moving the fab up with snackbar 2015-02-28 00:28:20 +01:00
Vincent Breitmoser c46fdef203 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-27 23:53:14 +01:00
Vincent Breitmoser 8cfba4c0fb slightly longer color fade duration 2015-02-27 23:52:51 +01:00
Vincent Breitmoser aec9bdfc1e transition status color in key view 2015-02-27 23:10:02 +01:00
Vincent Breitmoser 863f4e6ac1 hand through result in CertifyFingerprintActivity 2015-02-27 23:09:17 +01:00
Vincent Breitmoser 80c159056d show refresh key progress inline 2015-02-27 22:46:48 +01:00
Vincent Breitmoser 2cd7be6373 go to directly to certify screen after nfc import 2015-02-27 18:05:36 +01:00
Vincent Breitmoser a70d80483d add unit test for "no expiry where revoked user id still has expiry" case 2015-02-26 19:06:23 +01:00
Vincent Breitmoser 4ff8eca292 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-02-26 18:54:00 +01:00
Vincent Breitmoser 55dd6526a6 split up and mark unsafe expiry-related methods 2015-02-26 18:53:42 +01:00
Vincent Breitmoser e5bb7a35b5 save revocation instead of self-cert for revoked uids 2015-02-26 18:53:16 +01:00
Vincent Breitmoser d7888d4666 ignore revoked user ids for primary key expiry 2015-02-26 18:52:54 +01:00
Vincent Breitmoser ad8209bd94 pre-select certification key if only one is available 2015-02-26 10:48:17 +01:00
Vincent Breitmoser bb30cb5401 fix comments and some warnings in PgpDecryptVerify 2015-02-17 18:43:43 +01:00
Vincent Breitmoser 260ffdf588 add check for filesize to encrypt/decrypt tests 2015-02-17 18:09:07 +01:00