Commit Graph

82 Commits

Author SHA1 Message Date
Vincent Breitmoser
f8677a5f16 Merge branch 'result-parcels' 2014-09-13 21:32:17 +02:00
Dominik Schürmann
7d41800e57 Use spannable directly instead of html conversion in SubkeysAdapter 2014-09-13 19:49:16 +02:00
Vincent Breitmoser
dbbefe2f41 working version of DecryptVerifyResult 2014-09-13 19:30:10 +02:00
Vincent Breitmoser
4c636a1471 introduce OperationResultParcel for PgpDecryptVerify operations (WIP) 2014-09-13 17:54:10 +02:00
Vincent Breitmoser
19252380f1 promote all result parcels to top level classes in their own package 2014-09-13 14:36:23 +02:00
Dominik Schürmann
eecf4f655b Unify package name 2014-09-08 22:34:43 +02:00
Dominik Schürmann
518d7116e2 Work on Yubikey decryption 2014-09-08 14:04:46 +02:00
Dominik Schürmann
7ccd30b78e Fix signature timestamp in API 2014-09-08 00:17:13 +02:00
Dominik Schürmann
83af19de20 Prepare Yubikey decryption 2014-09-08 00:01:29 +02:00
Dominik Schürmann
fd7f187364 Fix yubikey for signAndEncrypt via API 2014-09-07 23:19:55 +02:00
Dominik Schürmann
4c2419642b Remove SelectSecretKey, not used anymore 2014-09-07 19:18:19 +02:00
Dominik Schürmann
d172058150 Due to compatiblity switch from SHA512 to SHA256 2014-09-07 17:58:28 +02:00
Dominik Schürmann
27772d401c Save account on back press and with notify 2014-09-07 16:10:28 +02:00
Dominik Schürmann
59f32c4fca Drawer nav method cleanup 2014-09-06 16:36:58 +02:00
Dominik Schürmann
35962cd254 Fix possible nullpointer in AppsListFragment 2014-09-02 23:13:59 +02:00
Dominik Schürmann
40e6b24b14 Prepare API for OpenPgpSignatureResult extensions 2014-08-31 23:50:04 +02:00
Dominik Schürmann
5e7eed239f Better leyout for account settings 2014-08-31 20:26:06 +02:00
Dominik Schürmann
c0ebc92611 Merge branch 'master' into yubikey
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2014-08-28 11:00:18 +02:00
Dominik Schürmann
71657d993c API: Fix re-seletion of keys on default account 2014-08-23 15:27:25 +02:00
Dominik Schürmann
d1ef355f55 Fix result handling in account settings 2014-08-21 00:29:49 +02:00
Dominik Schürmann
735040e193 return some more results 2014-08-20 20:24:19 +02:00
Dominik Schürmann
f46f2b6895 Fixes and temporary fixes for returning results 2014-08-20 19:46:44 +02:00
Dominik Schürmann
bbe986743c API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables 2014-08-16 05:28:51 +02:00
Dominik Schürmann
443170b876 do not pre-select revoked or expired keys 2014-08-16 04:11:39 +02:00
Dominik Schürmann
8d60d9f103 Fix encrypt only 2014-08-16 03:59:58 +02:00
Dominik Schürmann
e72e47d92e Remove support for v3 sig generation 2014-08-14 15:24:37 +02:00
Dominik Schürmann
ad69e47cec Support for multiple hash algos 2014-08-14 14:50:13 +02:00
Dominik Schürmann
6da17ef6bb Merge branch 'master' into yubikey
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
2014-08-14 13:31:01 +02:00
Dominik Schürmann
37edd0f390 API: Return metadata only for v4 api clients and above... 2014-08-14 13:10:38 +02:00
Dominik Schürmann
1a8606f194 API: Return metadata only for v4 api clients 2014-08-14 13:08:39 +02:00
Dominik Schürmann
d0987edab9 Dont write version header by default 2014-08-14 11:44:47 +02:00
Dominik Schürmann
db12f782f2 API: User interaction when account keys are deleted 2014-08-13 18:48:42 +02:00
Dominik Schürmann
38da2af0e8 Better error handling for passphrase cache if key is missing 2014-08-13 16:37:28 +02:00
Dominik Schürmann
fd055a893b Fix DECRYPT_METADATA api 2014-08-12 17:04:11 +02:00
Dominik Schürmann
a4a6314041 Fix API version support, update api lib 2014-08-12 13:54:46 +02:00
Dominik Schürmann
ae5e75f4e1 Implement EXTRA_ORIGINAL_FILENAME for API 2014-08-11 23:57:11 +02:00
Dominik Schürmann
acf5b99434 Update api lib 2014-08-11 21:26:52 +02:00
Dominik Schürmann
d5b40de70a Decrypt metadata api 2014-08-11 17:29:41 +02:00
Dominik Schürmann
59096b37fd Support API versions 3 and 4 2014-08-11 17:22:53 +02:00
Dominik Schürmann
881a50207a Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
2014-08-06 01:08:12 +02:00
Dominik Schürmann
e4974ac409 Use CompressionAlgorithmTags instead of homebrew constants 2014-08-05 23:50:59 +02:00
Dominik Schürmann
f4802157dd Optimize imports 2014-08-05 22:46:00 +02:00
Dominik Schürmann
e10cbc54c6 Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
2014-08-01 11:09:25 +02:00
Vincent Breitmoser
b156a057e8 rename Wrapped*Key* to Canonicalized*Key* 2014-07-31 17:09:30 +02:00
Dominik Schürmann
43b8170a44 Merge branch 'master' of github.com:open-keychain/open-keychain
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
2014-07-30 00:58:28 +02:00
Dominik Schürmann
6448de8f6a Create key with fragments 2014-07-30 00:50:53 +02:00
Vincent Breitmoser
a8782272b3 some more work on supertoast and result parcel stuff 2014-07-27 00:46:38 +02:00
Dominik Schürmann
bf10eb91b7 Remove support for V3 signatures 2014-07-22 18:24:12 +02:00
Dominik Schürmann
e4e8bc5e07 Cleanup 2014-07-22 18:14:17 +02:00
Dominik Schürmann
99af2c33d3 Reuse signature creation timestamp for synchronous signing 2014-07-22 18:09:12 +02:00