moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-15 05:15:03 -05:00
Code Issues Releases Wiki Activity
4,158 Commits 12 Branches 24 Tags 116 MiB
79b7cec94a
Commit Graph

2121 Commits

Author SHA1 Message Date
Dominik Schürmann
726ff0b501 Fix strings with email address 2015-03-29 21:00:36 +02:00
Dominik Schürmann
7ffb55faaa Merge branch 'development' into v/crypto-input-parcel 2015-03-29 21:00:06 +02:00
Dominik Schürmann
95f1527afe Fixing crashes with new encrypt ui 2015-03-29 20:37:54 +02:00
Dominik Schürmann
6b48ddd717 Merge pull request #1188 from adithyaphilip/import-message-error 
Corrected import error message, changed style to WARN
 2015-03-28 18:11:26 +01:00
Adithya Abraham Philip
1af522cf35 changed style to WARN, corrected error message 2015-03-28 19:47:54 +05:30
Daniel Ramos
605c9ace58 -Fixed a situation where additional emails could be duplicated when creating a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations. 2015-03-27 23:15:27 +00:00
Dominik Schürmann
b82f273284 Start reworking decrypt ui classes 2015-03-27 00:55:55 +01:00
Dominik Schürmann
13f4cc4ad3 Refactoring of EncryptTextActivity 2015-03-27 00:40:37 +01:00
Dominik Schürmann
f62a5eded4 Merge branch 'development' into v/crypto-input-parcel 2015-03-26 22:48:06 +01:00
Dominik Schürmann
76db0b3b8e Start refactoring encrypt ui, EncryptFileActivity no longer crashing 2015-03-26 11:04:20 +01:00
iseki
621e7401a8 Modify break as return. 2015-03-26 12:18:41 +09:00
iseki
59a446d7f4 Add brackets for if-else constructs and externalize the procedure as showMultiExportDialog. 2015-03-26 11:59:18 +09:00
Dominik Schürmann
1ef63f3187 Fix certify with CryptoInputParcel 2015-03-25 11:12:52 +01:00
Dominik Schürmann
5e024bba2e Remove backward compat in CertifyKeyFragment 2015-03-25 10:50:55 +01:00
iseki
e83532cb19 Add a loop for multiple key export. 2015-03-25 04:44:53 +09:00
Dominik Schürmann
040cf42cb0 Merge branch 'development' into v/crypto-input-parcel 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java
 2015-03-24 13:19:43 +01:00
Dominik Schürmann
eeccd7cd14 3.2beta3 2015-03-23 23:04:35 +01:00
Dominik Schürmann
827d122ab0 translation fixes 2015-03-23 22:38:20 +01:00
Dominik Schürmann
6b164ad8bf Fix language problems reported by yahoe.001 on transifex 2015-03-23 22:18:29 +01:00
Dominik Schürmann
2204195234 Update build env and plugins 2015-03-23 20:17:30 +01:00
Dominik Schürmann
e2f27d0f47 Pull from transifex 2015-03-23 15:54:48 +01:00
Dominik Schürmann
4405e5fbdd Remove remaining html entities in changelog 2015-03-23 15:48:51 +01:00
Dominik Schürmann
95639f2720 Merge pull request #1165 from kentnek/dev-yubikey-null 
Fixed #1152: NullPointerException when signing with YubiKey
 2015-03-23 15:39:16 +01:00
Dominik Schürmann
54cd414693 Merge pull request #1166 from adithyaphilip/multi-threaded 
Multi-threaded key import, update all feature
 2015-03-23 15:38:57 +01:00
Dominik Schürmann
aa3565b857 Fix passphrase cache not clearing all passphrases 2015-03-23 15:38:02 +01:00
Dominik Schürmann
30711c3fe7 Merge pull request #1174 from Jesperbk/development 
Fixed symmetric encryption crash
 2015-03-23 13:01:10 +01:00
JesperBK
5bdac11ef8 Fixed issue where setting a passphrase to null later causes a NullPointerException. 2015-03-23 11:17:01 +01:00
Adithya Abraham Philip
9f5581463f shifted multi-threading to own service 
added multi-threaded cloud import, restored KeychainIntentService

eliminated code duplication in multi-threaded import
 2015-03-23 15:37:05 +05:30
Adithya Abraham Philip
19775c399b introduced multi-threading 
refactored oldKeys to updatedKeys

added update all keys, ThreadPoolExecutor

used modified CachedThreadPoolExecutor
 2015-03-23 15:34:22 +05:30
Vincent Breitmoser
c694d73cab further improve yubikey error handling 2015-03-23 01:48:44 +01:00
Dominik Schürmann
78e7e986af Markdown comments 2015-03-23 01:23:42 +01:00
Dominik Schürmann
c3cd96d79f Remove changelog in main folder, update comments 2015-03-23 01:21:26 +01:00
Dominik Schürmann
633b64fd95 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-23 01:11:17 +01:00
Dominik Schürmann
b3a599f214 Use markdown for in-app help 2015-03-23 01:11:11 +01:00
Vincent Breitmoser
3bb194fc08 nicer handling of nfc errors 2015-03-23 01:09:39 +01:00
Vincent Breitmoser
5227b45af8 Merge branch 'development' into v/crypto-input-parcel 2015-03-22 22:21:19 +01:00
Vincent Breitmoser
8b4388e1a2 use top line in snackbar for status indication 2015-03-22 16:55:46 +01:00
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
Dominik Schürmann
58d066a54e Pull from transifex 2015-03-10 16:19:46 +01:00
Dominik Schürmann
446e16fc62 Disable maybe methods in ImportKeysListEntry for now 2015-03-10 15:55:19 +01:00
Dominik Schürmann
79a4e7fb9c Fix expiry, revoked checks in OpenPgpSignatureResultBuilder 2015-03-10 15:52:44 +01:00
Dominik Schürmann
0e32b37f9d Changelog 3.2beta1 2015-03-10 15:35:47 +01:00
Dominik Schürmann
7346144ba9 Remove unused NFC Beam html 2015-03-10 15:18:24 +01:00
Dominik Schürmann
f13953e8fc API 7 2015-03-10 11:34:35 +01:00
Dominik Schürmann
b3257e0ffa Ripple 2015-03-10 02:13:36 +01:00
Dominik Schürmann
64e85a2eb4 Merge branch 'contact-card' of https://github.com/adithyaphilip/open-keychain into adithyaphilip-contact-card 
Conflicts:
	Graphics/get-material-icons.sh
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
	OpenKeychain/src/main/res/layout/create_key_email_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-03-10 01:51:30 +01:00
Dominik Schürmann
b74fa6c662 Merge pull request #1121 from adithyaphilip/rawcontact-deletion 
Fixed contact deletion Issue #1120
 2015-03-10 01:45:28 +01:00
Dominik Schürmann
bce0fe6221 Add additional email addresses in create key 2015-03-10 01:44:07 +01:00
Dominik Schürmann
3012001979 Show passphrase checkbox in create key 2015-03-10 03:46:10 +05:30
Adithya Abraham Philip
224f243c79 added CALLER_IS_SYNCADAPTER parameter to delete queries 2015-03-10 03:28:12 +05:30
Adithya Abraham Philip
5f0a468d9a changed default drawable for linked system contact 2015-03-10 02:49:34 +05:30
Dominik Schürmann
7d2e2e3eec Make create key wizard step-by-step 2015-03-10 02:49:34 +05:30
Dominik Schürmann
e3547b4979 Show passphrase checkbox in create key 2015-03-09 22:09:48 +01:00
Dominik Schürmann
67076b2019 Make create key wizard step-by-step 2015-03-09 22:00:44 +01:00
Adithya Abraham Philip
012b7e4830 cleaned up code, added comments 
optimised imports
 2015-03-10 01:33:55 +05:30
Adithya Abraham Philip
f8a6f814dd added contact linking 2015-03-10 01:08:09 +05:30
Adithya Abraham Philip
bc43797c32 added card 2015-03-10 01:08:09 +05:30
danielnelz
704821a8db Merge remote-tracking branch 'upstream/development' into development 2015-03-09 20:25:03 +01:00
danielnelz
7d27faf00c Added braces to if else. 2015-03-09 20:14:11 +01:00
danielnelz
17301be2ca Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType 
in KeychainIntentService and replaced int constants with them. Fixed some
typos.
 2015-03-09 20:09:05 +01:00
Dominik Schürmann
cc66435e38 Some fixes for delete after encryption 2015-03-09 18:59:15 +01:00
Dominik Schürmann
7c22fc843b Fix ascii armor in encrypt activity 2015-03-09 18:33:20 +01:00
Dominik Schürmann
009e8e9e39 Fix compression check in activities 2015-03-09 18:21:54 +01:00
Dominik Schürmann
3fe7fa202c API: If signature key is known return pi to show key 2015-03-09 17:12:46 +01:00
Dominik Schürmann
b2e5ac2820 Fix colors for remote activity 2015-03-09 16:55:23 +01:00
Dominik Schürmann
bd1705410a Cleanup new widgets 2015-03-09 16:17:12 +01:00
Dominik Schürmann
d8c4867825 Merge pull request #1112 from chipset95/issue-1106-imp 
Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106
 2015-03-09 16:08:45 +01:00
Dominik Schürmann
72c18734ad Redesign of encrypt activites finished 2015-03-09 16:03:58 +01:00
chipset95
c55353e2b8 Implemented NameEditText 2015-03-09 18:12:44 +05:30
Dominik Schürmann
c50dceab32 Improve icons 2015-03-09 13:27:24 +01:00
chipset95
e2c502a511 Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106 2015-03-09 17:55:46 +05:30
Dominik Schürmann
cf2aa34970 Fix padding in create key 2015-03-09 13:18:21 +01:00
Dominik Schürmann
9572327c36 Removed unused PasswordEditText 2015-03-09 12:59:35 +01:00
Dominik Schürmann
80f2822dd8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-09 12:52:17 +01:00
Dominik Schürmann
7ac4f63ea3 Merge pull request #1111 from adithyaphilip/passphrase-strength-indicator 
Passphrase strength indicator
 2015-03-09 12:51:00 +01:00
Adithya Abraham Philip
820005bc37 minor xml code style correction 2015-03-08 12:57:37 +05:30
Vincent Breitmoser
30ca8637ff add support for certification of user attributes 2015-03-08 01:46:30 +01:00
Adithya Abraham Philip
f181a1ecbe minor code style correction 2015-03-07 13:07:28 +05:30
Adithya Abraham Philip
976c40e45f removed created by comment 2015-03-06 22:42:37 +05:30
Adithya Abraham Philip
1de528fc85 cleaned up code 2015-03-06 22:25:35 +05:30
Adithya Abraham Philip
f12f6b540d changed default colors for PasswordStrengthView 2015-03-06 22:11:33 +05:30
Adithya Abraham Philip
fee891fc06 added PassphraseEditText to SetPassphraseDialogFragment 2015-03-06 22:00:30 +05:30
Adithya Abraham Philip
c5093433f5 added PassphraseEditText 2015-03-06 21:32:17 +05:30
Dominik Schürmann
4013a36276 Remove dublicate email check 2015-03-06 11:20:45 +01:00
Dominik Schürmann
def4492107 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-06 11:16:06 +01:00
Dominik Schürmann
a03f6d35d6 Improve way of getting possible names by filtering out emails 2015-03-06 11:14:27 +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
Dominik Schürmann
f31ada30d0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-06 10:50:31 +01:00
chipset95
7c2fefe2f7 Added GPLv3 License 2015-03-06 14:47:11 +05:30
tdjogi010@gmail.com
61b306a74a Asks Passphrase for key delete/export in ViewKeyActivity. 2015-03-06 11:50:41 +05:30
chipset95
d83219f3a0 Created EmailEditText, PasswordEditText and implemented wherever required 2015-03-06 11:13:56 +05:30
Dominik Schürmann
d74a662614 Tryout design for encrypt, decrypt 2015-03-06 01:52:06 +01:00
Dominik Schürmann
eaf7e5e005 Fix elevation 2015-03-06 01:12:33 +01:00
Dominik Schürmann
0bb3b9c6cc Format code of merged password strength widget 2015-03-05 23:39:41 +01:00
Dominik Schürmann
23b8e8272c Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
 2015-03-05 23:29:43 +01:00
Dominik Schürmann
e50eda4e29 Use ArrayList instead of LinkedList 2015-03-05 17:59:53 +01:00
Dominik Schürmann
02084ba14a Cleanup of PgpConstants 2015-03-05 17:53:14 +01:00
Dominik Schürmann
afbb166de6 Add missing header 2015-03-05 17:52:12 +01:00
Dominik Schürmann
3bc3e3e6f4 Check for insecure hash and symmetric encryption algos on decrypt 2015-03-05 17:46:43 +01:00
Dominik Schürmann
aeb0169f02 Use static linked lists instead of arrays 2015-03-05 17:24:56 +01:00
Dominik Schürmann
0300bce41f Add missing file with PGP Constants 2015-03-05 16:58:15 +01:00