Commit Graph

282 Commits

Author SHA1 Message Date
Andrea Torlaschi
26f8a9db9c Extend FileProvider to support name update 2016-03-05 13:17:15 +01:00
Vincent Breitmoser
5989b7b4b8 add some license headers 2016-02-24 19:08:20 +01:00
Vincent Breitmoser
1c256e9e50 external-provider: add permission check for status query 2016-02-24 11:31:32 +01:00
Vincent Breitmoser
da3167476b external-provider: add (experimental) external provider 2016-02-24 11:31:32 +01:00
Vincent Breitmoser
b1a978d573 split off ApiDataAccessObject from ProviderHelper 2016-02-24 11:31:32 +01:00
Vincent Breitmoser
da6dfb57a0 Merge branch 'master' into performance 2016-02-10 17:36:02 +01:00
Dominik Schürmann
79db5c0ebe Replace spongycastle with bouncycastle 2016-02-09 00:24:46 +01:00
Vincent Breitmoser
b1ea126142 performance: avoid expensive getSecretKeyType call, use cached where possible 2016-02-05 16:10:47 +01:00
Vincent Breitmoser
24ef87535f keylist: filter results by all user ids for search (fixes #1645) 2015-12-29 00:35:37 +01:00
Vincent Breitmoser
7943604435 fix accidental commit (thought I had removed that) 2015-11-15 03:36:30 +01:00
Vincent Breitmoser
a41e6e0c70 allow database downgrade for debug builds 2015-11-15 03:10:30 +01:00
Vincent Breitmoser
abfa7d743c some optimizations and indexes for the main key list query 2015-11-15 03:08:31 +01:00
Vincent Breitmoser
0456caedf4 provider: add debug variable to explain query plans 2015-11-15 02:18:39 +01:00
Vincent Breitmoser
529b9518c1 decrypt: skip all encountered marker packets (fix #1582) 2015-11-15 01:01:09 +01:00
Dominik Schürmann
97ca5091c2 Improve file handling in TemporaryFileProvider 2015-10-21 22:14:54 +02:00
Dominik Schürmann
52c6d8f8e0 Remove debug code 2015-10-15 20:11:58 +02:00
Dominik Schürmann
7384fa7f2b Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for db contract 2015-10-15 19:37:08 +02:00
Vincent Breitmoser
8f40c6df51 use only primary and mutually bound subkeys for fingerprint verification 2015-10-06 15:06:36 +02:00
Dominik Schürmann
9a6aa07089 Prevent database downgrade (OKC-01-012) 2015-09-25 00:01:24 +02:00
Vincent Breitmoser
3cd54581c3 mime: create more general InputDataOperation, which for now and does basic mime parsing 2015-09-15 03:02:05 +02:00
Vincent Breitmoser
486117d9de sort confirmed keys before unconfirmed primary ones (OKC-01-011) 2015-09-11 03:56:07 +02:00
Vincent Breitmoser
9d97d37c06 perform fingerprint check after canonicalization (OKC-01-009) 2015-09-11 01:57:17 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids)
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
2015-08-29 13:28:56 +02:00
Adithya Abraham Philip
0251f0e416 introduced constants for keyserver sync, fixed sync issue 2015-08-20 21:02:29 +05:30
Adithya Abraham Philip
1ef6f883e3 introduced keyserver sync adapter 2015-08-20 21:02:29 +05:30
Dominik Schürmann
3d8eda6e3e Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys 2015-08-10 09:35:23 +02:00
Dominik Schürmann
57378be1c0 Introduce constants in OpenPgpSignature and DecryptionResult for unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos 2015-08-09 21:49:56 +02:00
Vincent Breitmoser
6cbc0ceeae comment for database fix 2015-07-08 03:52:38 +02:00
Vincent Breitmoser
af546ae101 apply database fix for bogus rows introduced by issue #1402 2015-07-08 02:55:35 +02:00
Dominik Schürmann
e66794969e Package cert not sig 2015-07-07 22:15:15 +02:00
Vincent Breitmoser
17defe556a cleanup, NonNull annotation, never return null in PgpDecryptVerify 2015-07-06 00:52:53 +02:00
Vincent Breitmoser
539379a629 some cleanup and documentation 2015-07-06 00:10:54 +02:00
Adithya Abraham Philip
4d81a83baa added proxy support to OperationHelper 2015-07-03 20:46:16 +05:30
Adithya Abraham Philip
2402c6d3c7 ensuring code style is preserved 2015-07-03 20:46:15 +05:30
Adithya Abraham Philip
a5257ec71d Merge branch 'master' of github.com:open-keychain/open-keychain 2015-06-30 22:12:16 +05:30
Dominik Schürmann
93e6b6f9b5 Use signature-level signature for TemporaryStorageProvider and describe the security model 2015-06-29 10:54:27 +02:00
Dominik Schürmann
99c06b085b Add brackets in KeychainProvider 2015-06-29 09:24:34 +02:00
Dominik Schürmann
5b320d01d0 Use application/octet-stream as default type in TemporaryStorageProvider 2015-06-29 07:58:00 +02:00
Adithya Abraham Philip
f64e1467ad split import and export ops 2015-06-27 01:21:52 +05:30
Adithya Abraham Philip
aa0bd4c9e0 introduced CryptoOperationHelper in ImportKeysActivity 2015-06-27 01:17:01 +05:30
Vincent Breitmoser
dce4503ac5 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-26 02:44:59 +02:00
Vincent Breitmoser
51d35c7a83 instrument: first couple of tests for OpenPGP API 2015-06-26 01:59:11 +02:00
Vincent Breitmoser
8d141176bd fix original file deletion (and instrumentation) 2015-06-23 21:56:27 +02:00
Vincent Breitmoser
4135790161 fix decrypt view intents, save mimetype in storage provider, and thumbnail loading in decrypt list 2015-06-20 07:29:09 +02:00
Vincent Breitmoser
3b791f6633 add mimetype and streamtype support in TemporaryStorageProvider 2015-06-20 05:03:40 +02:00
Vincent Breitmoser
7f3154ecea Merge branch 'master' into v/multi-decrypt 2015-06-17 21:33:31 +02:00
Vincent Breitmoser
f5aa36ef9f fix rest of resource leaks (#1351) 2015-06-17 21:30:25 +02:00
Vincent Breitmoser
374b21410e Merge branch 'v/instrument' into v/multi-decrypt
Conflicts:
	.travis.yml
	OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
2015-06-17 19:24:07 +02:00
Vincent Breitmoser
312cb38848 preliminary EditKeyTest 2015-06-17 18:52:59 +02:00
Vincent Breitmoser
baea318470 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-11 17:12:07 +02:00