cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,273 Commits 1 Branch 0 Tags
5b75b542e8d2d467ce9e34bd9df2038d6c88885e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 5b75b542e8 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity 2015-05-16 23:10:04 +02:00
Vincent Breitmoser aa133574b0 fix fragment handling in ViewKeyActivity 2015-05-16 23:10:00 +02:00
Vincent Breitmoser f188b5b9b7 linked-ids: remove debug uri 2015-05-16 23:06:19 +02:00
Vincent Breitmoser df44d9b65c allow linked token without one colon 2015-05-12 11:57:07 +02:00
Vincent Breitmoser 6fe0a55522 rename LinkedIdentity to LinkedAttribute 2015-05-12 11:56:39 +02:00
Vincent Breitmoser 20a6c5ce8a Merge tag 'v3.2.1' into linked-identities 
Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-11 17:28:34 +02:00
Vincent Breitmoser 92ac2ded10 linked-ids: small compatibility changes 2015-05-11 17:00:45 +02:00
Vincent Breitmoser 9aff6c7f85 linked-ids: add certificate pinning, pin twitter api cert 2015-05-09 19:27:33 +02:00
Vincent Breitmoser 3600cda3bc linked-ids: rename RawLinkedIdentity to UriAttribute 2015-05-09 19:09:09 +02:00
Vincent Breitmoser 57f72996e8 linked-ids: rename "cookie" to "token" 2015-05-09 12:29:43 +02:00
Vincent Breitmoser 4378f8f871 linked-ids: code cleanup, handle all lint errors 2015-05-09 12:24:48 +02:00
Vincent Breitmoser 91d500b20d check for fingerprint of any subkey (arguable?) 2015-05-06 11:26:01 +02:00
Vincent Breitmoser 39382e978f check for fingerprint of any subkey (arguable?) 2015-05-06 11:25:29 +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 1fd35cc23b fix crash when moving focus from EncryptKeyCompletionView with unknown text 2015-04-28 18:21:51 +02:00
Vincent Breitmoser efb87baf47 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:18:43 +02:00
Vincent Breitmoser 6b940d42d9 fix "select all" in key list multi-select 2015-04-28 18:18:14 +02:00
Vincent Breitmoser 91b774d223 prevent crashes in EncryptKeyCompletionView 2015-04-27 19:49:54 +02:00
Vincent Breitmoser fc61208ce7 small ui niceties 2015-04-27 19:49:42 +02:00
Vincent Breitmoser dd1243c312 prevent crashes in EncryptKeyCompletionView 2015-04-27 19:48:58 +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 32db4e393b display creation dates for ambiguous user ids 2015-04-27 17:45:50 +02:00
Vincent Breitmoser 0ad66eb510 add distinct status for messages signed by "your" key 2015-04-27 14:40:52 +02:00
Vincent Breitmoser 8dbb82a8b6 profiling says: caching qrCode bitmaps is a good idea 2015-04-27 13:52:38 +02:00
Vincent Breitmoser ef8506fc26 small changes for performance 2015-04-27 13:52:00 +02:00
Vincent Breitmoser c08fe2b50d profiling says: caching qrCode bitmaps is a good idea 2015-04-27 13:51:39 +02:00
Vincent Breitmoser 18a88d35be show linked ids card only if unfiltered ids are available 2015-04-26 12:57:04 +02:00
Vincent Breitmoser 68b3c22f7b Merge remote-tracking branch 'origin/development' into linked-identities 2015-04-26 01:02:42 +02:00
Vincent Breitmoser 1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml
 2015-04-26 01:02:22 +02:00
Vincent Breitmoser d6d678dae3 update uris and cookie patterns, plus some stylings 2015-04-25 03:40:38 +02:00
Vincent Breitmoser 608b66d192 change HttpsEditText to generic PrefixEditText 2015-04-25 03:39:40 +02:00
Vincent Breitmoser 24d407bce3 fix certification in unit tests 2015-04-24 19:38:59 +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 Breitmoser 6de403c21a fix encrypt activity layout 2015-04-24 19:16:15 +02:00
Vincent Breitmoser ca9ab02b7b revamp decrypt ui 2015-04-24 19:00:33 +02:00
Vincent Breitmoser ead7597afc don't show key spinner for a single entry 2015-04-24 15:44:53 +02:00
Vincent Breitmoser b12aa63cb3 use CryptoOperationFragment for linked id fragments, and some warning cleanup 2015-04-24 15:44:33 +02:00
Vincent Breitmoser b4aec3114d Merge branch 'development' into linked-identities 
Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-04-24 14:18:01 +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 c216346097 minor ui and wording changes 2015-04-09 16:06:37 +02:00
Vincent Breitmoser a4b7daf266 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-04-09 13:57:56 +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 d27925ad19 rewrite EncryptKeyCompletionView with generalized KeyAdapter 2015-03-30 02:42:16 +02:00
Vincent Breitmoser 01c444d637 even more linked id ui work 2015-03-29 23:38:01 +02:00
Vincent Breitmoser ab5a7d4094 more (subtle) ui work 2015-03-26 17:52:18 +01:00
Vincent Breitmoser dc8b04a793 more linked id ui fine tuning 2015-03-26 16:30:49 +01:00
Vincent Breitmoser aa6d0dd867 some linked id ui fine tuning 2015-03-26 13:53:43 +01:00
Vincent Breitmoser 3edf47c5de secret/public distinction in LinkedIdView 2015-03-24 19:47:54 +01:00
Vincent Breitmoser e573cd774a work on cookie scanning during creation 2015-03-24 16:41:01 +01:00
Vincent Breitmoser f9ef1160ca Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-03-24 15:29:58 +01:00
Vincent Breitmoser fe32e7bff4 support github resource (ci) 2015-03-24 03:49:28 +01:00
Vincent Breitmoser b25371fc1b support github resource (re) 2015-03-24 02:30:39 +01:00
Vincent Breitmoser 94dbeaeaf0 support github resource (pa) 2015-03-24 01:52:54 +01: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 7a83e34efe give short branch description in readme 2015-03-16 01:07:11 +01:00
Vincent Breitmoser 538be96e61 work on certification ui 2015-03-15 22:10:05 +01:00
Vincent Breitmoser 4afd6b881e Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-03-15 20:02:57 +01:00
Vincent Breitmoser db39b779c9 fix expiry of master keys 
fixes #1141
 2015-03-15 19:20:03 +01:00
Vincent Breitmoser ba7d8a5867 show certificates for secret keys differently 2015-03-14 23:10:58 +01:00
Vincent Breitmoser 3f844cc70b work on second step of identity creation 2015-03-13 16:30:49 +01:00