cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,902 Commits 1 Branch 0 Tags
93c7eb72fbbf93938043566dfc1707b6714f325b
Commit Graph

107 Commits

Author SHA1 Message Date
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
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
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
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
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
9c9f95c7ac New Passphrase class for safer passphrase handling in memory 2015-03-19 03:03:46 +01:00
Adithya Abraham Philip
6f496730be removed unnecessary @TargetApi annotation 2015-03-17 02:32:09 +05:30
Dominik Schürmann
a655664c0b object oriented split user id 2015-03-16 13:54:01 +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
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
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
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
Dominik Schürmann
183457334f Merge pull request #1117 from danielnelz/development 
#1042: Replaced ints with enums
 2015-03-12 13:27:04 +01:00
Adithya Abraham Philip
45eea9b5b8 corrected linked system contact display name 2015-03-11 23:10:32 +05:30
Dominik Schürmann
b3257e0ffa Ripple 2015-03-10 02:13:36 +01:00
Adithya Abraham Philip
224f243c79 added CALLER_IS_SYNCADAPTER parameter to delete queries 2015-03-10 03:28:12 +05:30
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
4013a36276 Remove dublicate email check 2015-03-06 11:20:45 +01:00
Dominik Schürmann
a03f6d35d6 Improve way of getting possible names by filtering out emails 2015-03-06 11:14:27 +01:00
Dominik Schürmann
e45f000cb4 Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists 2015-03-05 16:57:57 +01:00
Dominik Schürmann
8b7684baf7 Remove preferences multi process min sdk check 2015-03-05 15:12:59 +01:00
Dominik Schürmann
7ccdd7d38e Debug options 2015-03-05 11:14:19 +01:00
Dominik Schürmann
c121657c2c Better selection of preferred algorithm 2015-03-05 10:49:57 +01:00
Dominik Schürmann
17a627919c Simplified language: Confirm keys 2015-03-04 18:34:42 +01:00
Dominik Schürmann
b662ff6c49 Get high res version of contact photo 2015-03-04 15:39:41 +01:00
Dominik Schürmann
46944198e4 ContactHelper cleanup 2015-03-04 15:12:00 +01:00
Dominik Schürmann
ff42dfc9db Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED instead of EXPIRY where possible 2015-03-04 15:02:51 +01:00
Dominik Schürmann
363d41ed1d Cleanup of contact sync, debugging 2015-03-03 00:26:15 +01:00
Dominik Schürmann
69865a6d57 Use index constants in ContactHelper 2015-03-02 15:44:34 +01:00
Vincent Breitmoser
67093ccba2 forgot to commit FabContainer 2015-02-28 00:40:11 +01:00
Dominik Schürmann
d984f50cb7 Disable default yubikey PIN by default 2015-02-22 23:55:23 +01:00
Vincent Breitmoser
7b24ee7b55 rewrite PgpSignEncrypt data flow 
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
 2015-02-01 23:14:26 +01:00
Vincent Breitmoser
5466d1e980 prevent recursive consolidate 2015-01-31 18:49:00 +01:00
Dominik Schürmann
5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development 
Conflicts:
	OpenKeychain/build.gradle
 2015-01-29 09:55:09 +01:00
Vincent Breitmoser
8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Dominik Schürmann
3ac466c9db Disable sharing chooser blacklisting for lollipop 2015-01-19 17:22:31 +01:00
Dominik Schürmann
fe25a68c6a Yubikey numkey by default to true 2015-01-14 20:19:56 +01:00
Vincent Breitmoser
2b1c5358b7 make user_ids table typed, with attribute_data support 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2015-01-14 00:02:53 +01:00
Dominik Schürmann
fc32f5f9d4 Minor code cleanup 2014-11-21 12:41:39 +01:00
Vincent Breitmoser
082722a3cf prevent cancel dring consolidate, move logic into progressable 2014-10-26 22:00:57 +01:00
Dominik Schürmann
be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
Vincent Breitmoser
214b60cd00 integrate download from keyserver into key import operation 2014-10-23 23:29:40 +02:00
Jerzy Kołosowski
13ed3bbd8a Added option for num keypad for YubiKey 2014-10-13 04:47:48 +02:00
Vincent Breitmoser
815ed2e233 rewrite export with new operation style 2014-10-13 00:26:59 +02:00
Dominik Schürmann
45b02008fb Replace many PgpGeneralExceptions with PgpKeyNotFoundException 2014-10-09 01:37:44 +02:00