cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,929 Commits 1 Branch 0 Tags
538be96e61f5b6c2c39b02ed2f1550a1a6a9a2c9
Commit Graph
3929 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann 809cd6e495 Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist 2015-03-15 18:58:09 +01:00
Dominik Schürmann 3da60c9ea3 Add ignore dirty to other git submodules 2015-03-15 18:47:56 +01:00
Dominik Schürmann fd5719ff6b Remove display of key id in other lists 2015-03-15 18:40:52 +01:00
Dominik Schürmann 81d6da899f Show main user id instead of key in certify screen 2015-03-15 16:32:52 +01:00
Dominik Schürmann e873bac880 Fixes for selection of certify key 2015-03-15 16:24:06 +01:00
Dominik Schürmann ff60e80d42 Merge pull request #1142 from tdjogi010/development 
Preselected Suitable Key
 2015-03-15 15:56:12 +01:00
Dominik Schürmann 8a2bd80d40 Merge pull request #1148 from manojkhannakm/development 
Fixed a ClassCastException
 2015-03-15 15:35:32 +01:00
Dominik Schürmann f1dc58ddfd Merge pull request #1147 from Hiperzone/development 
-fixed out of bounds crash when retrieving the main profile name with se...
 2015-03-15 15:34:07 +01:00
Dominik Schürmann f4cb254404 Dont display key ids in KeySpinner, display creation date when user ids duplicate 2015-03-15 15:29:06 +01:00
Dominik Schürmann 0b654bdfe5 Use fixed version of com.squareup:fest-android, enable offline builds 2015-03-15 14:57:37 +01:00
Manoj Khanna 0fe060e88e Fixed a ClassCastException 2015-03-15 12:30:08 +05:30
Dominik Schürmann c2593f29ff Query for duplicate user ids 2015-03-15 02:40:31 +01:00
Daniel Ramos d3dd9020f5 -fixed out of bounds crash when retrieving the main profile name with secret keys 
-fixed a possible crash when retrieving the main profile contactid
 2015-03-15 00:12:26 +00:00
Dominik Schürmann 6c9b2ce0c0 Add missing license headers 2015-03-15 00:49:29 +01:00
Vincent Breitmoser ba7d8a5867 show certificates for secret keys differently 2015-03-14 23:10:58 +01:00
Dominik Schürmann 8ede97b9ff Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-14 21:36:35 +01:00
Dominik Schürmann f1b1ecae20 Merge pull request #1143 from manojkhannakm/development 
Fix for Issue #1115
 2015-03-14 21:36:28 +01:00
Dominik Schürmann afa7790fbd disable debug sync 2015-03-14 14:08:03 +01:00
Dominik Schürmann 12734127a7 Use names also for main contact 2015-03-14 14:07:45 +01:00
Dominik Schürmann cd7f631221 Show key name instead of key id in contacts, cleanup 2015-03-14 14:05:31 +01:00
Dominik Schürmann 23290b9013 Merge pull request #1144 from adithyaphilip/main-profile-keys 
Own keys linked to "me" contact
 2015-03-14 13:40:53 +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
tdjogi010@gmail.com da3540805e Merge branch 'development' of https://github.com/tdjogi010/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
 2015-03-13 11:35:05 +05:30
tdjogi010@gmail.com d56c90ce76 Preselected Suitable Key 2015-03-13 11:06:13 +05:30
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
Adithya Abraham Philip d7ef2c1b9e added some documentation 2015-03-13 04:49:34 +05:30
Adithya Abraham Philip 759009ddb4 added own profile support in linekd system contact 2015-03-13 04:04:11 +05:30
Vincent Breitmoser 9776957ab1 fix linked wizard buttons 2015-03-12 22:50:22 +01:00
Adithya Abraham Philip d4375b7dfc links own keys to me profile in contacts 2015-03-13 03:13:22 +05:30
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
Manoj Khanna 5b5e5b4981 Fix for Issue #1115 2015-03-13 00:53:05 +05:30
tdjogi010@gmail.com 448797e649 Preselected Suitable Key 2015-03-12 20:59:05 +05:30
Dominik Schürmann b953623802 Clarify logs in DeleteFileDialog 2015-03-12 14:34:58 +01:00
Dominik Schürmann 27027b8ee5 Use notify instead of Toast for NFC check 2015-03-12 13:39:20 +01:00
Dominik Schürmann 67a9f12790 Merge pull request #1133 from Rrego6/development 
Check if NFC is available on device
 2015-03-12 13:38:15 +01:00
Dominik Schürmann 183457334f Merge pull request #1117 from danielnelz/development 
#1042: Replaced ints with enums
 2015-03-12 13:27:04 +01:00
Dominik Schürmann dae48e84c8 Improve file deletion strings 2015-03-12 13:18:31 +01:00