cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,803 Commits 1 Branch 0 Tags
08fd2a2de3795cf8fc4be590ba993c356c8eb67f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 08fd2a2de3 use loader in LinkedIdViewFragment 2015-03-09 16:30:13 +01:00
Vincent Breitmoser 99eb8725e9 successfully certify linked ids 2015-03-08 04:42:19 +01:00
Vincent Breitmoser b57bcefe08 return key ids from PassphraseDialogActivity, accept null userids 2015-03-08 04:41:41 +01:00
Vincent Breitmoser ea7068acdf minor changes, add convertFingerprintToKeyId method 2015-03-08 03:12:26 +01:00
Vincent Breitmoser 2b5023a75d Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
 2015-03-08 01:49:22 +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 Breitmoser 581cad5b3f work on certification step 2015-03-08 00:59:16 +01:00
Vincent Breitmoser 9e930f0a10 finish after linked id creation 2015-03-06 17:12:49 +01:00
Vincent Breitmoser 5840e9d2b6 use final fragment superclass for twitter 2015-03-06 17:12:49 +01:00
Vincent Breitmoser 73ba19460b use final fragment superclass for dns 2015-03-06 17:12:49 +01:00
Vincent Breitmoser 088282483f extract linked id create final fragment superclass 2015-03-06 17:12:45 +01:00
Vincent Breitmoser a3ac2738ea prepare superclass extraction for final linked id creation fragment 2015-03-06 16:24:48 +01:00
Vincent Breitmoser 6e17d5244d first steps in ui towards confirmation of linked ids 2015-03-06 14:21:13 +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 Breitmoser a2419aa688 work on LinkedIdViewFragment 2015-03-05 18:05:48 +01:00
Vincent Breitmoser 5d2c81d715 make linked identity list homogeneous 2015-03-05 13:13:43 +01:00
Vincent Breitmoser 7b3bc4ca98 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
 2015-03-05 12:10:51 +01:00
Vincent Breitmoser 98ce06dbc9 small fixes to the matcher 2015-03-05 10:42:17 +01:00
Vincent Breitmoser 9798ef7bfd fixed length identifiers 2015-03-05 02:10:44 +01:00
Vincent Breitmoser 1f324be243 do a TON of UI work 2015-03-05 01:58:36 +01:00
Vincent Breitmoser 8222315dbd work more on separation of linked identities and resources, initial ui work 2015-03-04 12:30:56 +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 d4df509a1d remove unused bits from projection 2015-03-02 20:59:07 +01:00
Vincent Breitmoser e059b5550c nonce is 4 bytes 2015-03-02 20:40:37 +01:00
Vincent Breitmoser 8bec183eda add linked it to view key context menu 2015-03-02 19:05:52 +01:00
Vincent Breitmoser 7e4c39c79d rescale qr code bitmap in background 2015-03-02 18:44:24 +01:00
Vincent Breitmoser e6af789bf5 Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
 2015-03-02 18:34:51 +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 5e53a5417c some fixes for compiling (still not working!) 2015-03-02 14:45:44 +01:00
Vincent Breitmoser 2f83291920 NON-WORKING Merge branch 'development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java
	OpenKeychain/src/main/res/layout/view_key_main_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
	extern/spongycastle
 2015-03-02 14:39:28 +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
Vincent Breitmoser 3efaac2175 determine correct filesize during decryption from LiteralData packet 2015-02-17 18:08:45 +01:00
Vincent Breitmoser d125149bf7 fix tests for new PgpSignEncryptInput 2015-02-02 12:29:37 +01:00
Vincent Breitmoser 7b24ee7b55 rewrite PgpSignEncrypt data flow 
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
 2015-02-01 23:14:26 +01:00
Vincent Breitmoser 0b6dc65c97 Merge remote-tracking branch 'origin/development' into development 2015-01-31 18:49:54 +01:00
Vincent Breitmoser 5466d1e980 prevent recursive consolidate 2015-01-31 18:49:00 +01:00
Vincent Breitmoser 8c496287a2 update openpgp-api-lib for charset support 2015-01-27 09:46:13 +01:00
Vincent Breitmoser 6c80025ead backend support for charset in ascii-armored streams 2015-01-27 09:17:23 +01:00
Vincent Breitmoser efe5c80b1c remove unused NonPgpPartException 2015-01-26 16:33:10 +01:00
Vincent Breitmoser 2bb7c3bcef move last parts of import logic from kis into operation 2015-01-26 16:33:10 +01:00
Vincent Breitmoser b4781343d9 specify our usage of java 1.7 in build files 2015-01-25 12:41:03 +01:00
Vincent Breitmoser 8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser 41aba69fad introduce PromoteKeyOperation to create dummy secret from public keys 2015-01-25 02:08:07 +01:00
Vincent Breitmoser 1516f951b7 work on divert-to-key and other keyring stuff 
- allow modifySecretKeyRing operation without passphrase, but a only
  restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
  divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
 2015-01-25 01:57:58 +01:00
Vincent Breitmoser fb2fa195bf allow explicit re-certification in SaveKeyringParcel 2015-01-24 23:11:54 +01:00
Vincent Breitmoser 0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +01:00
Vincent Breitmoser 53955a8014 forgot another test case in prev. commit 2015-01-19 19:15:44 +01:00
Vincent Breitmoser 89969252fd fix unit test for new key flag behavior 2015-01-19 18:53:12 +01:00
Vincent Breitmoser a65edcdb2f only respect most recent signature for key flags 2015-01-19 18:31:57 +01:00
Vincent Breitmoser e71bd3d9dd always show revoked user ids last! 2015-01-19 18:31:57 +01:00
Vincent Breitmoser 198ddfeff7 use Notify helper everywhere, replace supertoasts with snackbar library 2015-01-19 15:43:35 +01:00
Vincent Breitmoser aa22a0defc small language fix 2015-01-16 16:24:34 +01:00
Vincent Breitmoser 6c153b1543 linked id ui work dns/twitter 2015-01-16 15:59:26 +01:00
Vincent 491c12d5d3 No setContentView in onCreate for KeyListActivity 2015-01-16 15:41:43 +01:00
Vincent Breitmoser b6f0fb91da show notification if KeyListActivity is spawned with an EXTRA_RESULT 
Closes #1029

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2015-01-16 13:58:34 +01:00
Vincent Breitmoser b6a1463161 dns resource is parametrized by fqdn, class and type 2015-01-16 13:57:18 +01:00
Vincent Breitmoser 6935509d22 show notification if KeyListActivity is spawned with an EXTRA_RESULT 2015-01-16 13:50:25 +01:00
Vincent Breitmoser 92b8d874ed affirmation -> linked identity 2015-01-15 16:59:11 +01:00
Vincent Breitmoser c03bcc2799 work on dns resource, working (dummy) verification 2015-01-14 18:32:50 +01:00
Vincent Breitmoser 8ef104281b fix ambiguous column name in advanced key info 2015-01-14 14:12:49 +01:00
Vincent Breitmoser 55ea957644 fix ambiguous column name in advanced key info 2015-01-14 14:12:23 +01:00
Vincent Breitmoser 2e04888d36 involve user attributes in unit tests for merge and canonicalize! 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 73feaa974c small fixes to user attribute handling 2015-01-14 13:25:38 +01:00
Vincent Breitmoser bbc9d90c3e add basic tests for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 4660608887 fix log entry for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 503ecba23d involve user attributes in unit tests for merge and canonicalize! 2015-01-14 13:23:03 +01:00
Vincent Breitmoser 2d5abc7da9 small fixes to user attribute handling 2015-01-14 13:05:13 +01:00
Vincent Breitmoser 6f4226911a add basic tests for addition of user attributes 2015-01-14 13:04:09 +01:00
Vincent Breitmoser a75394fbd3 fix log entry for addition of user attributes 2015-01-14 11:07:27 +01:00
Vincent Breitmoser c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser 2b1c5358b7 make user_ids table typed, with attribute_data support 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2015-01-14 00:02:53 +01:00