cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,040 Commits 1 Branch 0 Tags
603eab729fcd76fb6c5324063affd4de9cbe8984
Commit Graph

206 Commits

Author SHA1 Message Date
Vincent Breitmoser
603eab729f export: clean up, fix possible infinite loop 2015-09-26 02:48:01 +02:00
Vincent Breitmoser
352e7685c2 export: move execute operation to top 2015-09-26 02:23:24 +02:00
Vincent Breitmoser
04fd2eeb79 remove "export to file" code path from export operation 2015-09-26 02:22:32 +02:00
Vincent Breitmoser
8ad31e3251 mime: skip trailing unsigned parts, and ignore nested signed data 2015-09-17 22:13:20 +02:00
Vincent Breitmoser
955a1f4b26 mime: support for signed-then-encrypted format 2015-09-17 21:51:11 +02:00
Vincent Breitmoser
76465fc687 mime: add failure case if openpgp processing fails! 2015-09-16 20:48:46 +02:00
Vincent Breitmoser
01038d6a26 mime: add logging messages 2015-09-16 20:45:12 +02:00
Vincent Breitmoser
93421e902c mime: handle non-mime data, just pass it through 2015-09-16 20:36:06 +02:00
Vincent Breitmoser
6624d1f830 mime: respect charset header (default to utf-8) 2015-09-16 19:54:57 +02:00
Vincent Breitmoser
ece06b1933 multidecrypt: use bottom sheet for longclick options 2015-09-16 19:52:26 +02:00
Vincent Breitmoser
24f2a9468c multidecrypt: display all outputUris as individual items 2015-09-16 02:56:14 +02:00
Vincent Breitmoser
0ed0ba88f9 mime: return one OpenPgpMetadata object per body part 2015-09-16 01:34:21 +02:00
Vincent Breitmoser
99fd1f4c22 preliminary working mime parsing in DecryptListFragment! (beware WIP, here be dragons!) 2015-09-16 00:05:21 +02:00
Vincent Breitmoser
326834fd58 mime: add logging to InputDataOperation 2015-09-15 23:06:15 +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
3814ae7d53 Merge branch 'master' into mime4j 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml
 2015-09-14 16:21:04 +02:00
Vincent Breitmoser
cdf67c3296 share rather than save log files (OKC-01-015) 2015-09-11 03:08:53 +02:00
Vincent Breitmoser
b76aa7fe11 never import secret keys from keyserver (OKC-01-001) 2015-09-11 02:05:17 +02:00
Vincent Breitmoser
9d97d37c06 perform fingerprint check after canonicalization (OKC-01-009) 2015-09-11 01:57:17 +02:00
Vincent Breitmoser
b78954fc16 add support for signed-only data in the backend (#1507) 2015-09-10 21:44:15 +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
Dominik Schürmann
7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
Adithya Abraham Philip
d6f3fb4e18 fixed update all crash 2015-08-24 05:59:17 +05:30
Vincent Breitmoser
16903357e1 mention filename to export to in log 2015-08-22 12:22:43 +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
65a993446c reworked keyserversyncadapterservice flow 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
a3395112e0 Revoke master key only 2015-08-17 10:25:02 +02:00
Dominik Schürmann
dbaf7070ea WIP mime parsing 2015-08-17 09:31:34 +02:00
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
dba145f5df Follow some of coorus recommendations: better selection of algo whitelist, ignore recipients preferred algos 2015-08-09 21:49:56 +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
Adithya Abraham Philip
fe0b083bc5 fixed multi-deletion bug, moved logic into DeleteKeyDialogActivity 2015-07-15 20:16:07 +05:30
Adithya Abraham Philip
c59196a6f1 upload only public key in revocation 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
b61a7d5535 added licenses, cleaned up code, fixed warnings 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
2827b1af16 added retry on upload failure 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
cdd9de99bf allowed operations to modify CryptoInputParcel they receive 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
faa66d6140 prevented passphrase caching on revocation 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
d1409fd5c8 use only one DeleteDialogActivity 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
fcd27d2600 implemented revocation on deletion 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip
a038a038c3 fixed QR code scan and serialKeyImport progress 2015-07-08 18:40:17 +05:30
Dominik Schürmann
7b35f9b07a Merge pull request #1424 from open-keychain/import-proxy 
Shifted proxy logic to ImportKeysListCloudLoader
 2015-07-08 11:41:46 +02:00
Vincent Breitmoser
5633fcc92f fix symmetric passphrase caching (fixes #1401) 2015-07-08 04:36:43 +02:00
Adithya Abraham Philip
be6b7ff899 shifted proxy checking to ImportKeysListCloudLoader 2015-07-08 07:47:24 +05:30
Dominik Schürmann
4837d4cc5c Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-08 03:12:24 +02:00
Dominik Schürmann
15cee8e7e9 Temporary fix for multi export 2015-07-08 03:12:20 +02:00
Vincent Breitmoser
d9b07625e8 addition of subkeys for divert-to-card primary keys is not supported 2015-07-08 01:42:47 +02:00
Vincent Breitmoser
642f83c1f4 better handling of divert-to-card keys for subkey modifications 2015-07-08 01:41:55 +02:00
Vincent Breitmoser
895d1fbef6 try cache in certify operation (fixes #1242) 2015-07-07 23:41:44 +02:00
Vincent Breitmoser
8b439be1f5 don't cache exporthelper, keep type for KeyItem in KeySpinner 2015-07-06 16:24:26 +02:00