cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,030 Commits 1 Branch 0 Tags
c2163460971cc01e65d7dfd18eec491f01ebc744
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 8b4388e1a2 use top line in snackbar for status indication 2015-03-22 16:55:46 +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
Vincent Breitmoser 9e3125c15e don't filter tweet intent 2015-03-13 14:58:06 +01:00
Vincent Breitmoser 9e379fd19c improve error handling in LinkedIdViewFragment, disable unknown identity types (for now?) 2015-03-13 14:37:52 +01:00
Vincent Breitmoser 4c122dfb60 verification takes a second at least 2015-03-13 14:07:37 +01:00
Vincent Breitmoser 8fcffdd7cd use ViewAnimator for progress, streamline text on first step 2015-03-13 14:03:27 +01:00
Vincent Breitmoser a9a5551d95 remove notiion of nonce/identifier 2015-03-13 01:55:31 +01:00
Vincent Breitmoser b26e57ab19 change finish button label to "link identity" 2015-03-13 01:37:54 +01:00
Vincent Breitmoser 9776957ab1 fix linked wizard buttons 2015-03-12 22:50:22 +01:00
Vincent Breitmoser 163cbb04a0 twitter layout step3 -> step2 2015-03-12 22:35:14 +01:00
Vincent Breitmoser 706d339004 regenerate twitter token 2015-03-12 22:09:05 +01:00
Vincent Breitmoser 4adf2b343c small fix for CreateFinalFragment 2015-03-12 22:06:30 +01:00
Vincent Breitmoser bebd726384 twitter Step3 -> Step2 2015-03-12 21:07:43 +01:00
Vincent Breitmoser 4f31bbff0f ditch custom text step for twitter 2015-03-12 21:03:42 +01:00
Vincent Breitmoser a5e8825882 finish implementing twitter resource 2015-03-12 20:46:50 +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 8d71a3fa92 better state management in LinkedIdView, move confirm progress into card 2015-03-10 19:02:51 +01:00
Vincent Breitmoser f58ab3e439 hack loadSystemContact back in 2015-03-10 05:11:46 +01:00
Vincent Breitmoser 531697ffe7 Merge remote-tracking branch 'origin/development' into linked-identities 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
 2015-03-10 04:56:51 +01:00
Vincent Breitmoser 3b7f21d98a add expand item to linked id list 2015-03-10 04:27:40 +01:00
Vincent Breitmoser deafe946fd filter out unknown linked ids 2015-03-10 03:30:20 +01:00
Vincent Breitmoser f069d9814d minor additions to CertListWidget 2015-03-10 03:29:52 +01:00
Vincent Breitmoser 2a42ff016f cleaner handling of verification state 2015-03-10 02:08:51 +01:00
Vincent Breitmoser 4db86fdabe Merge remote-tracking branch 'development' into linked-identities 2015-03-10 00:57:23 +01:00
Vincent Breitmoser f76f84dfb2 concurrency and continuity fixes for verification backstack handling 2015-03-10 00:55:48 +01:00
Vincent Breitmoser 6df9387c2c support backstack for verification 2015-03-09 23:58:05 +01:00
Vincent Breitmoser ebf3596341 rearrange linked id layouts, add CertListWidget 2015-03-09 21:27:32 +01:00
Vincent Breitmoser 159b197930 add linked id certs uri to KeychainProvider 2015-03-09 21:03:27 +01:00
Vincent Breitmoser 138773798a fix transition animation 2015-03-09 16:56:10 +01:00
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