moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-14 21:05:09 -05:00
Code Issues Releases Wiki Activity
3,985 Commits 12 Branches 24 Tags 116 MiB
7c258bdedd
Commit Graph

1984 Commits

Author SHA1 Message Date
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
Dominik Schürmann
bf427ce9c1 Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development 2015-03-21 15:43:44 +01:00
Dominik Schürmann
10f9dcd7a1 Add TODO to remote API 2015-03-21 15:43:36 +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
Manoj Khanna
850a374788 Added docs for Notify class 2015-03-20 19:49:43 +05:30
Manoj Khanna
fa8d5657be Fixed Snackbar behind keyboard on ImportKeysActivity 2015-03-20 19:49:43 +05:30
Manoj Khanna
4e4b8efd6e Reworked Notify class 2015-03-20 19:49:42 +05:30
Dominik Schürmann
0954b02812 Merge pull request #1163 from kentnek/dev-list-footer 
Added a blank footer view to the list of keys
 2015-03-20 15:01:08 +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
Dominik Schürmann
ebf9bb3a63 Fix API RESULT_TYPE 2015-03-20 13:51:06 +01:00
Dominik Schürmann
9e668eadcb Fix PASSPHRASE handling in API 2015-03-20 13:38:07 +01:00
Kent
50913d0ff1 Updated GNU header 2015-03-20 12:38:16 +08:00
Kent
e0a5f1a0d4 Removed create and added GPLv3 header 2015-03-20 12:24:06 +08:00
Vincent Breitmoser
3b04636f5d support yubikeys in (some) edit key operations 2015-03-20 02:28:22 +01:00
Kent
1d6643fa6b Fixed #1152: 
- Checking if input.getSignatureSubKeyId() is not null before proceeding.
 2015-03-20 06:40:52 +08:00
Kent
8d6d4328f2 Implemented #1162: Invoke NFC in Advanced View 
- Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes
 - Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks
 - Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment.
 - Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
 2015-03-20 06:31:18 +08:00
Kent
4d43950841 - Added footer so that the Floating Action Button won't block the last few items' content 2015-03-20 06:11:50 +08:00
Dominik Schürmann
cfef53be01 Remove on click on icon 2015-03-19 17:21:26 +01:00
Dominik Schürmann
7e5cc9ee70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-19 17:16:30 +01:00
Dominik Schürmann
98817d13ee Manage my keys wizard 2015-03-19 17:16:23 +01:00
Manoj Khanna
6120365ee1 Fix for Issue #1114 
Displays the snackbar above the keyboard on all activities.
 2015-03-19 19:58:24 +05:30
Manoj Khanna
d122d27eba Fixed a crash on ViewKeyActivity 
This occurs when deleting a key with a stripped master key from the
ViewKeyActivity.
 2015-03-19 18:54:26 +05:30
Vincent Breitmoser
25d89b5550 generalize NfcOperationParcel to RequiredInputParcel, including passphrases 2015-03-19 14:21:30 +01:00
Dominik Schürmann
0bcc2793c3 Improve Passphrase class with finalize() 2015-03-19 13:58:26 +01:00
Dominik Schürmann
e65efce333 Fix tests for Passphrase class 2015-03-19 03:30:12 +01:00
Dominik Schürmann
b24ff10c43 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-19 03:04:08 +01:00
Dominik Schürmann
9c9f95c7ac New Passphrase class for safer passphrase handling in memory 2015-03-19 03:03:46 +01:00
Max Mertens
aab32b81b9 Added comments for server result sorting in key search 2015-03-18 22:24:29 +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
Max Mertens
74c474e3e2 Show HKP server results first in key cloud search. Fixes #1066 2015-03-18 17:49:57 +01:00
Vincent Breitmoser
4499caef1e introduce CryptoOperationParcel for nfc data 2015-03-18 14:06:59 +01:00
Adithya Abraham Philip
17181cbc19 contacts work on all supported api levels 2015-03-17 19:07:28 +05:30
Dominik Schürmann
dbcb7a9e10 Manifest cleanup 2015-03-17 13:29:54 +01:00
Dominik Schürmann
7f2a89e125 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-17 13:22:21 +01:00
Dominik Schürmann
444123d040 File extensions into Constants 2015-03-17 13:22:13 +01:00
Adithya Abraham Philip
6f496730be removed unnecessary @TargetApi annotation 2015-03-17 02:32:09 +05:30
Dominik Schürmann
025eaf0757 Disable hidden recipients for now 2015-03-16 20:34:27 +01:00
Dominik Schürmann
fd8f5ebb2f Allow for hidden recipients in encrypt methods 2015-03-16 18:20:44 +01:00
Dominik Schürmann
a5271bf229 Allow encrypt of filenames via overflow menu 2015-03-16 17:00:53 +01:00
Dominik Schürmann
146fa8d6c0 Clarify certification help screen 2015-03-16 15:05:39 +01:00
Dominik Schürmann
a655664c0b object oriented split user id 2015-03-16 13:54:01 +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
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
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
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
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