cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,854 Commits 1 Branch 0 Tags
0e71fcd638195003af36f4cf8f3192a381794516
Commit Graph
3854 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 0e71fcd638 Update openpgp-api lib 2015-03-16 13:03:17 +01:00
Dominik Schürmann 58450daef4 Fix nullpointer when scanning malformed qr codes 2015-03-16 00:16:20 +01:00
Dominik Schürmann ad9c35f522 Allow selection of none in SelectSignKeyIdActivity 2015-03-15 22:05:12 +01:00
Dominik Schürmann 5cb22ece30 Clarify MIME usage 2015-03-15 21:17:24 +01:00
Dominik Schürmann d824ec3bc9 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-15 19:35:12 +01:00
Dominik Schürmann 75368034bd Put API activites in normal process to allow hydrate/dehydrate of logs 2015-03-15 19:35:03 +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
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
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
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
Adithya Abraham Philip d4375b7dfc links own keys to me profile in contacts 2015-03-13 03:13:22 +05:30
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
Dominik Schürmann 4de978bccb Merge pull request #1137 from manojkhannakm/development 
Updated fix for Issue #1116
 2015-03-12 13:11:29 +01:00
Dominik Schürmann fb1701f09f Merge pull request #1134 from adithyaphilip/sync-confirmed-keys 
Sync only confirmed keys and change
 2015-03-12 13:08:18 +01:00
danielnelz 52200edfd7 Fixed possible ArrayIndexOutOfBoundsException. 2015-03-11 21:32:20 +01:00
Adithya Abraham Philip 08972de68f added contact sync at end of CertifyOperation 2015-03-11 23:11:01 +05:30
Adithya Abraham Philip 45eea9b5b8 corrected linked system contact display name 2015-03-11 23:10:32 +05:30
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
Manoj Khanna bb018b8fc1 Updated fix for Issue #1116 2015-03-11 20:52:00 +05:30
Dominik Schürmann 82a2a76a33 make constant for certify hash algo 2015-03-11 14:37:23 +01:00
Raoul 471f92a967 Check if NFC is available on device 2015-03-10 22:06:17 -04:00
Dominik Schürmann 4ed1bf0ca4 Version 3.2beta2 2015-03-10 16:30:00 +01:00
Dominik Schürmann 58d066a54e Pull from transifex 2015-03-10 16:19:46 +01:00