Dominik Schürmann
|
8f37b22adb
|
Fix possible nullpointer in Preferences
|
2014-08-29 18:39:15 +02:00 |
|
Dominik Schürmann
|
677d9e6023
|
Fix crash in PgpKeyHelper
|
2014-08-28 13:10:52 +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
|
b193965e58
|
Merge pull request #796 from open-keychain/develop
ECC support
|
2014-08-28 10:46:58 +02:00 |
|
Dominik Schürmann
|
4aeacd5b51
|
Fix NullPointerException in ImportKeysActivity
|
2014-08-28 10:40:11 +02:00 |
|
Dominik Schürmann
|
c2f6aa09c5
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-27 19:28:46 +02:00 |
|
Dominik Schürmann
|
d795f8d4e2
|
Strip out duplicate user ids
|
2014-08-27 19:28:33 +02:00 |
|
Vincent Breitmoser
|
cb2eb8aca2
|
small language fixes for previous commit
|
2014-08-27 15:42:09 +02:00 |
|
Dominik Schürmann
|
12a5b2174f
|
Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696
|
2014-08-27 14:12:59 +02:00 |
|
Dominik Schürmann
|
86a05033ae
|
Cleanup FoldableLinearLayout
|
2014-08-27 13:54:33 +02:00 |
|
Vincent Breitmoser
|
783dae8804
|
add ecc support
|
2014-08-24 16:08:37 +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
|
3d6f5e8ba1
|
Fix contact sync
|
2014-08-22 09:01:37 +02:00 |
|
Dominik Schürmann
|
152cd10b70
|
Revert "No need for setSyncAutomatically, this is only for network tickles"
This reverts commit 0c1e65bc8b.
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
|
2014-08-22 08:53:16 +02:00 |
|
Dominik Schürmann
|
3acbe9052f
|
Add ECDH and ECDSA values
|
2014-08-21 15:40:09 +02:00 |
|
Dominik Schürmann
|
aa35f6cffb
|
Fixing build with Spongy Castle 1.51
|
2014-08-21 15:20:49 +02:00 |
|
Dominik Schürmann
|
7adff7c7df
|
Add info about device with intent chooser bug
|
2014-08-21 14:41:32 +02:00 |
|
Dominik Schürmann
|
b7de91ad51
|
Disable custom intent chooser
|
2014-08-21 14:07:37 +02:00 |
|
Dominik Schürmann
|
562e379c56
|
Fix nullpointer when revoking keys
|
2014-08-21 11:40:48 +02:00 |
|
Dominik Schürmann
|
3c46c3c2df
|
Add account only on jelly bean and above
|
2014-08-21 11:36:47 +02:00 |
|
Dominik Schürmann
|
0c1e65bc8b
|
No need for setSyncAutomatically, this is only for network tickles
|
2014-08-21 11:33:42 +02:00 |
|
Dominik Schürmann
|
2930f83b2a
|
Change account type
|
2014-08-21 11:19:44 +02:00 |
|
Dominik Schürmann
|
4c6783215f
|
cleanup
|
2014-08-21 00:33:52 +02:00 |
|
Dominik Schürmann
|
d1ef355f55
|
Fix result handling in account settings
|
2014-08-21 00:29:49 +02:00 |
|
Vincent Breitmoser
|
ad9339b23d
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-21 00:02:33 +02:00 |
|
Vincent Breitmoser
|
63ca81d871
|
Copyright (C) 2014 Vincent Breitmoser
|
2014-08-21 00:02:27 +02:00 |
|
Dominik Schürmann
|
3ace5052e7
|
Comment extra in requestSync
|
2014-08-20 23:56:17 +02:00 |
|
Dominik Schürmann
|
6e3af6605a
|
Sync in KeychainIntentService on delete, import, save
|
2014-08-20 23:55:01 +02:00 |
|
Dominik Schürmann
|
642a63fab6
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 23:26:09 +02:00 |
|
Dominik Schürmann
|
418e922c78
|
Enable sync adapter, changelog
|
2014-08-20 23:26:01 +02:00 |
|
Dominik Schürmann
|
0b07c5258f
|
Disable key import in sync adapter
|
2014-08-20 23:13:37 +02:00 |
|
Vincent Breitmoser
|
ce4bfdf945
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 23:09:25 +02:00 |
|
Vincent Breitmoser
|
9c9fc5330a
|
small change to make android studio recognize a honeycomb-only block
|
2014-08-20 23:09:20 +02:00 |
|
Vincent Breitmoser
|
dcf268bcb2
|
move key deletion into KeychainIntentHandler
|
2014-08-20 23:08:52 +02:00 |
|
Dominik Schürmann
|
37caddca70
|
Upload key working
|
2014-08-20 22:51:00 +02:00 |
|
Vincent Breitmoser
|
945764b30f
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 22:38:28 +02:00 |
|
Dominik Schürmann
|
0f8958afb9
|
Upload key working
|
2014-08-20 22:17:16 +02:00 |
|
Vincent Breitmoser
|
dd1b27b28f
|
consolidate: small ui things
|
2014-08-20 21:52:54 +02:00 |
|
Vincent Breitmoser
|
6c428fa6b5
|
make number of secret keys imported part of ImportResult parcel
|
2014-08-20 21:51:57 +02:00 |
|
Vincent Breitmoser
|
9122d43d0a
|
close actionmode in keylist on loading events (avoid inconsistent state)
|
2014-08-20 21:51:19 +02:00 |
|
Dominik Schürmann
|
fa25265e79
|
Fix key sharing
|
2014-08-20 21:51:01 +02:00 |
|
Dominik Schürmann
|
e33e5b0003
|
Work on upload key
|
2014-08-20 21:44:51 +02:00 |
|
Vincent Breitmoser
|
6ed0f667cd
|
consolidate: remove debug "breakpoint"
|
2014-08-20 21:29:11 +02:00 |
|
Dominik Schürmann
|
45706e6534
|
Notify duration, cleanup
|
2014-08-20 21:09:46 +02:00 |
|
Dominik Schürmann
|
937c91eefa
|
Fix nullpointer in first time activity
|
2014-08-20 20:44:49 +02:00 |
|
Dominik Schürmann
|
ccc1d2e006
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 20:24:24 +02:00 |
|
Dominik Schürmann
|
735040e193
|
return some more results
|
2014-08-20 20:24:19 +02:00 |
|
Vincent Breitmoser
|
2cc265390c
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 20:16:05 +02:00 |
|
Vincent Breitmoser
|
c296529049
|
modifyKey: small logging changes
|
2014-08-20 20:15:43 +02:00 |
|
Dominik Schürmann
|
50c33ef322
|
progress dialog design fix
|
2014-08-20 20:13:25 +02:00 |
|
Dominik Schürmann
|
e13c3bd1ac
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 20:08:56 +02:00 |
|
Dominik Schürmann
|
47bcc6149e
|
return some more results
|
2014-08-20 20:08:51 +02:00 |
|
Vincent Breitmoser
|
1e5ac82985
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-20 19:59:54 +02:00 |
|
Vincent Breitmoser
|
475293a116
|
consolidate: prevent concurrent calls of step 2
|
2014-08-20 19:59:45 +02:00 |
|
Dominik Schürmann
|
0e152d1db0
|
Merge branch 'master' of github.com:open-keychain/open-keychain
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
|
2014-08-20 19:48:19 +02:00 |
|
Dominik Schürmann
|
f46f2b6895
|
Fixes and temporary fixes for returning results
|
2014-08-20 19:46:44 +02:00 |
|
Vincent Breitmoser
|
fe1f5489ff
|
consolidate: implement (mostly) recovery mode
|
2014-08-20 19:34:36 +02:00 |
|
Vincent Breitmoser
|
9aaaac068e
|
consolidate: use KeychainProvider for deletion operation
|
2014-08-20 19:31:51 +02:00 |
|
mar-v-in
|
1a6734f29c
|
Fix mime types, #781
|
2014-08-19 18:54:48 +02:00 |
|
Dominik Schürmann
|
16ab761006
|
Fix strings
|
2014-08-19 18:12:19 +02:00 |
|
Vincent Breitmoser
|
9930ab7f6f
|
consolidate: a lot more log output, better recovery
|
2014-08-19 16:53:55 +02:00 |
|
Dominik Schürmann
|
c42f6a04ed
|
Start consolidate activity
|
2014-08-19 16:49:48 +02:00 |
|
Dominik Schürmann
|
4f8ddad9d3
|
ConsolidateDialogActivity
|
2014-08-19 16:40:57 +02:00 |
|
Dominik Schürmann
|
4be8c36b43
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-19 16:31:59 +02:00 |
|
Dominik Schürmann
|
5f8bbab569
|
Scroll fixes for certify activity
|
2014-08-19 16:31:51 +02:00 |
|
Vincent Breitmoser
|
9fb1050fed
|
stub for consolidate recovery in KeychainApplication
|
2014-08-19 15:56:53 +02:00 |
|
Vincent Breitmoser
|
0422d48b61
|
add ProgressFixedScaler (forgot in a previous commit)
|
2014-08-19 15:55:53 +02:00 |
|
Vincent Breitmoser
|
a2ae318a1a
|
add OpenDialogActivity (stub)
|
2014-08-19 15:55:40 +02:00 |
|
Vincent Breitmoser
|
c725239a69
|
consolidate: split into two steps, can pick up at second step if anything fails
|
2014-08-19 15:45:59 +02:00 |
|
Dominik Schürmann
|
8d668d170c
|
Notes about criticality
|
2014-08-19 15:23:37 +02:00 |
|
Dominik Schürmann
|
9474749be1
|
Decrease iteration count, delayed for 2.9
|
2014-08-19 14:51:28 +02:00 |
|
Dominik Schürmann
|
26e82afa8e
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-19 14:46:15 +02:00 |
|
Vincent Breitmoser
|
6a3150d878
|
fix primary user id in master key flag modification
|
2014-08-19 14:42:40 +02:00 |
|
Dominik Schürmann
|
c1d05d0ee9
|
Change criticallity of subpackets after discussion
|
2014-08-19 14:16:46 +02:00 |
|
Dominik Schürmann
|
4a280f6ba3
|
Use higher s2k count
|
2014-08-19 11:11:58 +02:00 |
|
Dominik Schürmann
|
d131693bb8
|
Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible
|
2014-08-19 10:58:38 +02:00 |
|
Dominik Schürmann
|
b1bde6ead9
|
Mark packets critical
|
2014-08-19 10:42:35 +02:00 |
|
Dominik Schürmann
|
2c8bcffff3
|
add feature to key sig subpacket to indicate that we want MDC
|
2014-08-19 10:37:27 +02:00 |
|
Dominik Schürmann
|
a2b3824556
|
New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering
|
2014-08-19 10:30:44 +02:00 |
|
Dominik Schürmann
|
6ffdafc0e6
|
Add license headers
|
2014-08-19 10:01:39 +02:00 |
|
Dominik Schürmann
|
a5d34478df
|
Add subkey: at least one flag should be selected!
|
2014-08-18 11:13:52 +02:00 |
|
Dominik Schürmann
|
3e7ce0008f
|
Fixes for expiry UI
|
2014-08-18 11:02:41 +02:00 |
|
Vincent
|
56fb822034
|
Merge pull request #772 from mar-v-in/issue-729
Remove NoSwipeWrapContentViewPager
|
2014-08-17 15:46:27 +02:00 |
|
mar-v-in
|
57b2440731
|
Work-around rendering bug when switching back to asymmetric with multiple recipients selected
|
2014-08-17 11:31:41 +02:00 |
|
mar-v-in
|
3cc57a092a
|
Remove NoSwipeWrapContentViewPager
|
2014-08-17 11:07:34 +02:00 |
|
Vincent Breitmoser
|
14290c3ce9
|
consolidate: working implementation, lacking ui
|
2014-08-17 03:29:03 +02:00 |
|
Vincent Breitmoser
|
aa625d4fbf
|
parametrize FileImportCache for filename
|
2014-08-17 00:49:14 +02:00 |
|
Vincent Breitmoser
|
c00343d516
|
modify*Key: improve handling of passphrase modification (add tests, too)
|
2014-08-16 21:04:43 +02:00 |
|
Vincent Breitmoser
|
e38f6a2a46
|
use correct algorithm for signatures (actually fix heterogeneous subkeys)
|
2014-08-16 19:45:14 +02:00 |
|
Vincent Breitmoser
|
62b7d2d7d8
|
fix small log format string mistake for adding subkeys
closes #768
|
2014-08-16 19:31:26 +02:00 |
|
Dominik Schürmann
|
f206902002
|
Fixing date picker issues
|
2014-08-16 16:17:46 +02:00 |
|
Dominik Schürmann
|
ccf58a92fa
|
Fix flags UI in add subkey dialog
|
2014-08-16 13:42:55 +02:00 |
|
Dominik Schürmann
|
c1f9c5e4b5
|
Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master key
|
2014-08-16 13:30:13 +02:00 |
|
Dominik Schürmann
|
4d698c896a
|
Fix expiry when adding subkeys
|
2014-08-16 12:28:49 +02:00 |
|
Dominik Schürmann
|
474fc50b80
|
Always return a SaveKeyringResult from saving
|
2014-08-16 12:24:46 +02:00 |
|
Dominik Schürmann
|
188eeb79c9
|
Fix and simplify in OperationResultParcel
|
2014-08-16 12:13:30 +02:00 |
|
Vincent Breitmoser
|
2497722b48
|
fix travis tests (more), minor comment edits
|
2014-08-16 07:12:37 +02:00 |
|
Vincent Breitmoser
|
7c7ba21714
|
tests: add test for master key revocation
|
2014-08-16 07:06:07 +02:00 |
|
Vincent Breitmoser
|
6e84c72801
|
tests: more expected error types
|
2014-08-16 06:53:50 +02:00 |
|
Vincent Breitmoser
|
de0d95432e
|
typed expected failures and a couple minor things
|
2014-08-16 06:53:50 +02:00 |
|