Dominik Schürmann
0fc1a09bfc
Version 2.9
2014-08-31 22:20:02 +02:00
Dominik Schürmann
9a18635b89
Changelog 2.9
2014-08-31 22:12:52 +02:00
Dominik Schürmann
428d6b1182
prevent nullpointer in ImportKeysServerFragment, return empty lists instead of null
2014-08-31 21:52:14 +02:00
Dominik Schürmann
9258fbfb74
Cleanup keyspinner layout, key id typeface monospace
2014-08-31 20:39:36 +02:00
Dominik Schürmann
bdf0436c94
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-31 20:26:12 +02:00
Dominik Schürmann
5e7eed239f
Better leyout for account settings
2014-08-31 20:26:06 +02:00
Vincent Breitmoser
e9a2f256b9
add cancel prevention mechanism, improve cancellation for key import
2014-08-31 20:05:19 +02:00
Vincent Breitmoser
d17b478a9e
don't make our service sticky
2014-08-31 19:31:21 +02:00
Vincent Breitmoser
e46bc24079
add cancel support to edit key action
2014-08-31 19:20:08 +02:00
Vincent Breitmoser
d483a8b73e
get rid of some last bootstrapbutton references
2014-08-31 19:01:28 +02:00
Dominik Schürmann
f6d1b45007
Move date picker to left because of width constraints inside the dialog
2014-08-31 18:51:29 +02:00
Vincent Breitmoser
06eb7148a2
Merge remote-tracking branch 'origin/master'
2014-08-31 17:37:45 +02:00
Vincent Breitmoser
7da7832284
Add cancelable mechanism and support in key import
...
Closes #323
2014-08-31 17:32:13 +02:00
Dominik Schürmann
5444c14ef9
Hide keyserver spinner under advanced options in certify activity
2014-08-31 17:26:29 +02:00
Vincent Breitmoser
38c6cf045c
remember "show advanced tabs" setting
...
Closes #669
2014-08-31 00:39:37 +02:00
Vincent Breitmoser
a73abf57f1
if there is only one private key, use it fo certification by default
2014-08-31 00:19:59 +02:00
Vincent Breitmoser
0738a38bbe
use LoaderFragment for CertifyActivity
2014-08-31 00:19:16 +02:00
Vincent Breitmoser
56f760e3f8
ditch NullProgressable
2014-08-30 18:32:29 +02:00
Vincent Breitmoser
8981fcf93d
fix one log level
2014-08-30 17:22:20 +02:00
Vincent Breitmoser
07ecd38842
get rid of a deprecated method use
2014-08-30 17:12:12 +02:00
Vincent Breitmoser
b6203a2b3c
Merge remote-tracking branch 'dakid/master'
2014-08-30 17:03:47 +02:00
Vincent Breitmoser
5ff3043903
canonicalize: add check for algorithm type
...
closes #797
2014-08-30 17:00:58 +02:00
Daniel Albert
c7c2ccab45
Encrypted message is not being spellchecked anymore
2014-08-30 16:55:47 +02:00
Vincent Breitmoser
ac080b21ef
show bitsizes in import key list again
...
closes #802
2014-08-30 15:45:36 +02:00
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
9288e4f0a9
Fix RuntimeException in KeyListActivity on tablets
2014-08-28 10:37:01 +02:00
Dominik Schürmann
6d9a18941b
v2.8
2014-08-27 19:29:17 +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
79c4d3ea49
Pull from transifex
2014-08-22 09:54:01 +02:00
Dominik Schürmann
77c7eb9096
v2.8 beta4
2014-08-22 09:01:57 +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
da072ef69c
2.8 beta3
2014-08-21 14:08:01 +02:00
Dominik Schürmann
b7de91ad51
Disable custom intent chooser
2014-08-21 14:07:37 +02:00
Dominik Schürmann
acff54d7d7
2.8 beta2
2014-08-21 11:44:55 +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
f0ff8d2222
Add sync properties
2014-08-21 11:25:41 +02:00
Dominik Schürmann
2930f83b2a
Change account type
2014-08-21 11:19:44 +02:00
Dominik Schürmann
7adf07a9f9
XML cleanup
2014-08-21 10:47:29 +02:00
Dominik Schürmann
e1d60c698c
v2.8 beta1
2014-08-21 00:46:30 +02:00
Dominik Schürmann
41052d6f8f
Pull from transifex
2014-08-21 00:36:15 +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
e8bc9083f2
improve certs_text
2014-08-20 23:01:27 +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
2a96912a96
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-20 19:34:42 +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
Dominik Schürmann
c3b12bb3c2
Pull from transifex
2014-08-20 18:30:22 +02:00
Dominik Schürmann
70426041df
Pull from transifex
2014-08-20 11:09:41 +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
c1a265bfd1
certs header design
2014-08-19 10:01:31 +02:00
Dominik Schürmann
638c29792d
Header for certs view
2014-08-19 09:52:15 +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
Vincent Breitmoser
a943bebfdf
support for master key modifications, among other stuff
2014-08-16 06:53:50 +02:00
Vincent Breitmoser
1fa77d57d2
modifySecretKey: err out on "use previous" expiry date for (sub)key creation
2014-08-16 06:53:50 +02:00
Vincent Breitmoser
c54fe21f44
modifySecretKey: err out on revocation of nonexistent user id
2014-08-16 06:53:50 +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
b1dc663930
Remove old_apg
2014-08-15 11:07:21 +02:00
Dominik Schürmann
b1fa5d9922
Remove subkeys.pgp.net keyserver from defaults
2014-08-15 11:00:45 +02:00
Dominik Schürmann
2c2860e86d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-15 10:19:51 +02:00
Dominik Schürmann
cf450d24fb
Remove subkeys.pgp.net keyserver, often down and no hkps
2014-08-15 10:19:46 +02:00
Vincent Breitmoser
09d37a5fa6
fix keys with no expiry in ui code
2014-08-14 22:12:18 +02:00
Dominik Schürmann
750ced4525
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-14 19:25:43 +02:00
Dominik Schürmann
0f60bcbc3d
Pass through of master key id in SaveKeyringResult
2014-08-14 19:25:39 +02:00
Vincent Breitmoser
48935557e8
support changing expiry of subkeys to none
2014-08-14 19:12:29 +02:00
Vincent Breitmoser
6e7b999409
fix subkey certification canonicalization (why did the test not catch this?!)
2014-08-14 18:57:55 +02:00
Dominik Schürmann
28df004cbb
Merge pull request #767 from mar-v-in/issue-763
...
Use dropdown in CertifyActivity
2014-08-14 18:53:40 +02:00
Dominik Schürmann
a58440b85d
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-14 18:51:44 +02:00
Dominik Schürmann
65e76f6e44
hacky fix to prevent key list from scrolling to top when opening nav drawer
2014-08-14 18:51:35 +02:00
mar-v-in
e1958009bd
Do not allow self certifying
2014-08-14 18:10:22 +02:00
Vincent Breitmoser
9af301ec77
handle modify and save errors in KeychainIntentResult
2014-08-14 17:12:17 +02:00
Vincent Breitmoser
9c03889390
tests: add ProviderHelperSaveTest, with long key id collision test
2014-08-14 17:10:40 +02:00
Vincent Breitmoser
2c408f679c
dem logix
2014-08-14 16:34:57 +02:00
Vincent Breitmoser
a19784ed7e
merge: check fingerprints on merge operation! (this needs a testcase!)
2014-08-14 16:28:03 +02:00
Dominik Schürmann
05da0f4328
change keybase hint following pull request #755
2014-08-14 16:20:24 +02:00
mar-v-in
eebd480e8d
Fix KeySpinner on cursor change
2014-08-14 16:14:16 +02:00
Dominik Schürmann
9ad09a3982
Automcomplete names and emails in keyserver tab
2014-08-14 16:12:42 +02:00
mar-v-in
a6118877ff
Add and use CertifyKeySpinner
2014-08-14 16:02:28 +02:00
mar-v-in
00286744f2
small bug in has_certify
2014-08-14 16:02:28 +02:00
mar-v-in
07d6a26778
add OnKeyChangedListener to KeySpinner
2014-08-14 16:02:27 +02:00
mar-v-in
9fab740aad
add HAS_CERTIFY (not sure why it's missing)
2014-08-14 16:02:27 +02:00
mar-v-in
ef2449917e
factor KeySpinner out
2014-08-14 16:02:27 +02:00
Dominik Schürmann
62f7bf6215
move v3 key import prevention into canonicalization method
2014-08-14 15:58:26 +02:00
Dominik Schürmann
0a1de8deea
Do not import v3 keys, they are insecure!
2014-08-14 15:42:02 +02:00
Dominik Schürmann
225e248293
Remove MD5 support
2014-08-14 15:30:08 +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
2fa613ad62
Merge pull request #766 from mar-v-in/patch-1
...
Handle keys without expiry date right
2014-08-14 11:43:50 +02:00
Dominik Schürmann
d0987edab9
Dont write version header by default
2014-08-14 11:44:47 +02:00
mar-v-in
b8f7dd5676
Handle keys without expiry date right
...
Fixes #765
2014-08-14 11:21:59 +02:00
Dominik Schürmann
f941431d63
Add user info dialog
2014-08-13 21:49:04 +02:00
Dominik Schürmann
c7d5b09286
Move certify action down into actions section
2014-08-13 21:23:01 +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
mar-v-in
f34597a3c0
remove bundle for symmetric/asymmetric fragment as it was useless
2014-08-13 13:02:30 +02:00
mar-v-in
e8b7bbd978
fix message and uri from encrypt intent
2014-08-13 12:48:02 +02:00
Dominik Schürmann
fd055a893b
Fix DECRYPT_METADATA api
2014-08-12 17:04:11 +02:00
Dominik Schürmann
2bca58742b
Merge pull request #758 from mar-v-in/encrypt-only-show-relevant-keys
...
EncryptActivity: only show relevant keys
2014-08-12 14:15:11 +02:00
mar-v-in
82a41a2f7c
Only show relevant keys in encrypt, fix #756 #757
2014-08-12 13:56:30 +02:00
mar-v-in
80674021b5
Add convenience method to unified keyrings to determine whether a keyring is expired, fix is_revoked for certain usages
2014-08-12 13:54:56 +02:00
Dominik Schürmann
a4a6314041
Fix API version support, update api lib
2014-08-12 13:54:46 +02:00
mar-v-in
4fdf9ab486
Only show keyrings that have a valid sign key in from field, fixes #756
2014-08-12 12:57:08 +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
abf50c3750
Support mime type in metadata
2014-08-11 20:16:21 +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
b673565035
Get original filename for decryption
2014-08-11 17:10:47 +02:00
Dominik Schürmann
549feb69ed
Add option to pass original filename to PgpSignEncrypt
2014-08-11 10:00:24 +02:00
Dominik Schürmann
94b7b1b5d8
progress for signing binary
2014-08-11 09:55:24 +02:00
Dominik Schürmann
867b89be0a
More fixes for decryption progress
2014-08-11 01:31:51 +02:00
Dominik Schürmann
13f86890d6
Handle missing MDC as failed only if no valid signature is present
2014-08-10 21:50:46 +02:00
Dominik Schürmann
33a4d68520
More fixes for decryption progress
2014-08-10 21:09:10 +02:00
Dominik Schürmann
c981902aba
Handle missing integrity protection MDC packet as if integrity check would have failed.
...
An attacker could strip the MDC on its way to the receiver...
2014-08-10 20:59:13 +02:00
Dominik Schürmann
b0821a3ddd
Introduction of metadata api, starting to fix decryption progress
2014-08-10 20:44:02 +02:00
Dominik Schürmann
1abae04cda
Fix compression setting for encryption of files
2014-08-10 20:27:34 +02:00
Dominik Schürmann
65fd0de7e1
passphrase instead of pass phrase
2014-08-07 11:17:58 +02:00
Dominik Schürmann
d4105420f7
Pull from transifex
2014-08-07 10:01:57 +02:00
Dominik Schürmann
a908c7de67
Readd missing string
2014-08-07 10:01:42 +02:00
Dominik Schürmann
bac767d184
Edit key: prevent the combination of change to primary user id and revocation
2014-08-07 08:51:56 +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
6ba7536838
ModernPGP infos
2014-08-06 00:59:38 +02:00
Dominik Schürmann
8b0c389b1b
Update changelog and about
2014-08-06 00:32:04 +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
6354b2dcf9
Increase maximum custom RSA size
2014-08-05 22:38:36 +02:00
Dominik Schürmann
1455af2eed
Edit key: key flags
2014-08-05 22:35:37 +02:00
Dominik Schürmann
f8a222983e
Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry selection for adding new subkeys
2014-08-05 20:52:29 +02:00
Dominik Schürmann
39380a3617
More work on add subkey dialog design
2014-08-05 18:42:55 +02:00
Dominik Schürmann
04cdd45e1a
Work on add subkey dialog design
2014-08-05 18:35:48 +02:00
Dominik Schürmann
d377d1f23d
Better handling of user id revocation in UI code
2014-08-05 17:59:05 +02:00
Dominik Schürmann
160e6972d8
Create key: make single user id primary user id, other cleanup
2014-08-05 17:25:22 +02:00
Dominik Schürmann
369f6e080c
Refactor expiry dialog
2014-08-05 15:07:11 +02:00
Dominik Schürmann
e9fccff8bc
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-05 00:23:15 +02:00
Dominik Schürmann
80408460a0
KeychainContract: use longs instead of String, other fixes
2014-08-05 00:23:04 +02:00
mar-v-in
2712c18a7a
Use size of input uris for progress bar in encrypt/decrypt
2014-08-04 20:34:00 +02:00
Dominik Schürmann
ce8d38d9b3
Add license headers
2014-08-04 16:46:23 +02:00
Dominik Schürmann
7eafd77e15
Fix nullpointer, remove unused window feature
2014-08-04 16:37:42 +02:00
Dominik Schürmann
f5f6102458
Pull from transifex
2014-08-04 16:33:05 +02:00
Dominik Schürmann
a2c1221397
Fixing lint complaints, removing unused resources
2014-08-04 16:29:16 +02:00
Dominik Schürmann
3a6ac2a16a
More cleanup
2014-08-04 15:49:49 +02:00
Dominik Schürmann
e87c69647c
Even more smaller nitpicks
2014-08-04 15:40:34 +02:00
Dominik Schürmann
c4311e2f52
Remove support for IO_FILE, this is no longer used and was never a good practice, use IO_URI on Android!
2014-08-04 14:44:11 +02:00
Dominik Schürmann
839294d27c
Cleanup, prevent encrypt Intent inception
2014-08-04 14:42:03 +02:00
Dominik Schürmann
b42afcd32c
Fix debug backup/restore methods
2014-08-04 11:19:46 +02:00
Dominik Schürmann
fb5c829ff7
Remove old edit key stuff
2014-08-04 02:31:54 +02:00
Dominik Schürmann
7f463ae0df
Edit key: subkey adding, not finished
2014-08-04 02:26:34 +02:00
Dominik Schürmann
c39cf197f4
button language in encrypt
2014-08-04 00:54:57 +02:00
Dominik Schürmann
d9ffc26d64
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-04 00:49:25 +02:00
Dominik Schürmann
4979ccd645
Smaller UI fixes
2014-08-04 00:49:16 +02:00
Vincent Breitmoser
d4240f73f5
delete unused PgpConversionHelper
2014-08-04 00:39:59 +02:00
Dominik Schürmann
c2ca841ac9
Merge pull request #728 from mar-v-in/improve-file-more
...
Improve file encrypt
2014-08-04 00:21:59 +02:00
mar-v-in
d4f2d3842b
Minor cleanup
2014-08-02 04:16:26 +02:00
mar-v-in
e17c1a0cd4
Fix focusing with To field
2014-08-02 00:52:34 +02:00
mar-v-in
9d101b4fe5
Encrypt UI (drop downs)
2014-08-01 23:30:31 +02:00
Dominik Schürmann
0bfac9989f
Merge branch 'master' into yubikey
2014-08-01 17:54:53 +02:00
Dominik Schürmann
f72a07690c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-01 17:54:10 +02:00
Vincent Breitmoser
80ed3464f4
small fix for MSG_MF_UID_ADD log entry
2014-08-01 17:52:27 +02:00
Dominik Schürmann
c9b028804c
Add user id with dialog
2014-08-01 17:47:07 +02:00
Vincent Breitmoser
f555447011
fix dumb mistake in modifySecretKey
2014-08-01 17:46:04 +02:00
Vincent Breitmoser
827a958e12
remove debug output about security providers (cleaner unit tests)
2014-08-01 17:00:08 +02:00
Vincent Breitmoser
c0edaf9a5e
make FileImportCache generic, iterable, and add unit test
2014-08-01 16:59:48 +02:00
Vincent Breitmoser
11e5261f07
move classes around a bit
2014-08-01 16:50:33 +02:00
mar-v-in
b206b6d351
Cache input file thumbnail.
2014-08-01 12:41:30 +02:00
mar-v-in
1ebb92b336
Cache contact photos to make UI more fluid
2014-08-01 12:24:26 +02:00
mar-v-in
3a13cd5e4d
Fix first key is not used erroneously
2014-08-01 12:23:31 +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
mar-v-in
0568632f32
Merge branch 'master' into improve-file-more
2014-08-01 10:32:20 +02:00
Dominik Schürmann
acbf2a1861
Remve cacheing of keyrings (cleanup of #726 )
2014-08-01 09:35:38 +02:00
Dominik Schürmann
6ab19ca363
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-08-01 09:34:10 +02:00
Dominik Schürmann
d2f50eb60f
identity instead of credentials
2014-08-01 09:34:07 +02:00
Dominik Schürmann
13a85e5702
Merge pull request #726 from mar-v-in/fix-import-from-server
...
Fix import from server
2014-08-01 09:31:17 +02:00
mar-v-in
4b2b1a25e3
Fix CachedPublicKeyring
...
I had this code already in my git, but it was in between the load of other things in there, just pulled it out.
2014-08-01 05:37:21 +02:00
mar-v-in
00f5352ddc
Fixes after merge
2014-08-01 05:31:04 +02:00
mar-v-in
fc2a1f5838
Merge branch 'master' into improve-file-more
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
2014-08-01 05:29:40 +02:00
mar-v-in
3a97c36d4a
Undo import changes
2014-08-01 05:16:08 +02:00
mar-v-in
159c532ae2
Fix import from server
...
Was broken since 7bbe869c88
This also keeps the ACTION_IMPORT_KEYRING action stable
2014-08-01 05:11:24 +02:00
Dominik Schürmann
79f69f2fce
Start fixing CachedPublicKeyRing
2014-08-01 00:38:36 +02:00
Dominik Schürmann
a25ca5429f
Certifying instead of signing
2014-08-01 00:22:15 +02:00
Dominik Schürmann
f7cbf39555
Remove runtime check to fix passphrase service
2014-08-01 00:18:46 +02:00
Dominik Schürmann
a86b1d92f8
Use darker colors
2014-08-01 00:18:29 +02:00
Dominik Schürmann
afe56e08fe
Show file tab only for import of existing keys
2014-08-01 00:10:01 +02:00
Dominik Schürmann
08ae9db4ee
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-31 23:54:11 +02:00
Dominik Schürmann
55b764eb1d
Show revoked and expired for private keys
2014-07-31 23:54:02 +02:00
Dominik Schürmann
3451111edd
Fix update from keyserver
2014-07-31 23:51:08 +02:00
Vincent Breitmoser
faf3868f01
lowercase all key ids from keyserver
2014-07-31 23:49:53 +02:00
Vincent Breitmoser
3d7cdf5428
move upload/update buttons from menu to buttons
2014-07-31 23:49:53 +02:00
mar-v-in
c71cdc1432
Fix string resources
2014-07-31 23:36:37 +02:00
Dominik Schürmann
3e918a70ea
Remove private/secret key language from strings
2014-07-31 23:34:13 +02:00
Dominik Schürmann
97209f9d3d
Fixes for upload
2014-07-31 23:31:09 +02:00
mar-v-in
36d8c9f608
Fix merge
2014-07-31 23:20:43 +02:00
mar-v-in
eae7c711a3
Merge branch 'master' into improve-file-more
...
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
2014-07-31 23:19:01 +02:00
Dominik Schürmann
38120ae77c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-31 23:13:33 +02:00
Dominik Schürmann
db70fcfdbf
Create key: design fixes
2014-07-31 23:13:29 +02:00
Vincent Breitmoser
caad5d1fc1
fix bug in UploadKeyActivity, minor work on uri handling
2014-07-31 23:07:20 +02:00
Vincent Breitmoser
c5ce794ef7
more fixes on canonicalization and progress
2014-07-31 22:36:25 +02:00
mar-v-in
0c7eea225b
- add multi select for storage api (kitkat)
...
- UI fixes
- refactoring
2014-07-31 22:21:46 +02:00
Dominik Schürmann
50aea621ba
Fix animations in create key
2014-07-31 21:51:35 +02:00
Dominik Schürmann
b9694ae9c5
Add notify layouts to some activities
2014-07-31 21:29:45 +02:00
Dominik Schürmann
38922f96a6
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-31 21:20:16 +02:00
Dominik Schürmann
138d5a1d9c
Robots like coffee too...
2014-07-31 21:18:24 +02:00
Vincent Breitmoser
58c2ca6eb8
completely overengineer progress indication in {modify,create}SecretKeyRing methods
2014-07-31 20:59:50 +02:00
Dominik Schürmann
7bbe869c88
Parcelable data over 1MB can not be send through binder, parcel into a cache file, fix #592
2014-07-31 20:38:06 +02:00
Vincent Breitmoser
d48e980946
avoid nullpointerexception in EditKeyResult
2014-07-31 19:27:26 +02:00
Vincent Breitmoser
acb5a70e44
fix fromStream method, properly recognize multiple concatenated streams
2014-07-31 19:27:26 +02:00
Vincent Breitmoser
b40081c364
always return an EditKeyResult in modifyKey method
2014-07-31 19:27:25 +02:00
Dominik Schürmann
279ddf7cbe
Handle result in create key
2014-07-31 19:19:11 +02:00
Dominik Schürmann
258bd3a44f
Fix string
2014-07-31 19:06:30 +02:00
Dominik Schürmann
80f9c769c0
Keyserver exception translateable
2014-07-31 19:05:09 +02:00
Dominik Schürmann
b052d5e89c
Smaller notes
2014-07-31 18:42:54 +02:00
Vincent Breitmoser
ecb2c2c2b1
reduce memory usage while parsing multiple keyrings from a stream
2014-07-31 18:25:46 +02:00
Dominik Schürmann
aa32c60a0a
Even better Exception handling with keyserver queries
2014-07-31 18:07:11 +02:00
Dominik Schürmann
cc034a0913
Exception handling with keyserver queries
2014-07-31 17:56:47 +02:00
Vincent Breitmoser
33172d598d
couple of logging fixes
2014-07-31 17:09:30 +02:00
Vincent Breitmoser
b156a057e8
rename Wrapped*Key* to Canonicalized*Key*
2014-07-31 17:09:30 +02:00
Dominik Schürmann
9475285013
Better exception handling for import of keys
2014-07-31 17:11:06 +02:00
Dominik Schürmann
1d2c93ca8a
More file association hacks for AndroidManifest and key import
2014-07-31 16:15:36 +02:00
Dominik Schürmann
927b120275
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-30 17:47:25 +02:00
Dominik Schürmann
65488cbf05
Create key: work on upload
2014-07-30 17:47:17 +02:00
Vincent Breitmoser
64aac8023e
couple of fixes in save*KeyRing methods
2014-07-30 16:22:55 +02:00
Dominik Schürmann
fcc535a573
Create key: repeat passphrase
2014-07-30 15:29:01 +02:00
Dominik Schürmann
052cdfa392
Create key: upload
2014-07-30 15:19:33 +02:00
Dominik Schürmann
e46d72ba27
Fix drawer in key list
2014-07-30 14:59:12 +02:00
Dominik Schürmann
70bfb5c586
return values for create key
2014-07-30 14:57:59 +02:00
Dominik Schürmann
cdee62b79d
Create key: layout above buttons
2014-07-30 01:13:02 +02:00
Dominik Schürmann
9f9aa79066
Fix conflicts
2014-07-30 01:07:10 +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
4457b4a24c
fix a couple remaining AppMsgs
2014-07-29 14:00:36 +02:00
Vincent Breitmoser
377d0f09fa
Merge branch 'ditch-appmsg'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
2014-07-29 13:53:18 +02:00
Vincent Breitmoser
da131220aa
watch out for nullpointers from get(Un|)HashedSubpackets
...
fixes #721
2014-07-28 17:09:56 +02:00
Dominik Schürmann
cce243299a
Fix build by removing old icon reference
2014-07-28 16:26:06 +02:00
Dominik Schürmann
ed6a89f35c
Use new icons in other key related activites, delete old icons
2014-07-28 16:10:36 +02:00
Dominik Schürmann
23689da56d
Use verified icon for certify action
2014-07-28 12:24:40 +02:00
Dominik Schürmann
730f820c8c
Set visibility at last
2014-07-28 11:17:12 +02:00
Dominik Schürmann
3d6edd1190
Use icons in key view
2014-07-28 11:11:23 +02:00
Dominik Schürmann
a3045c710e
Use new status icons in key list
2014-07-28 09:34:57 +02:00
Dominik Schürmann
0c3b2a6ed4
Smaller status images, green test
2014-07-28 09:10:45 +02:00
Dominik Schürmann
b2f7e839e1
Fix resource names, add small test
2014-07-28 01:23:38 +02:00
Dominik Schürmann
61944b9e39
Add icons from ModernPGP project
2014-07-28 01:12:23 +02:00
Dominik Schürmann
6c7e3aee91
Fix background color of notify area
2014-07-27 21:45:48 +02:00
Dominik Schürmann
7e8b056574
cleanup left-overs
2014-07-27 21:44:00 +02:00
Dominik Schürmann
5974dccbea
Redesigned QR Code view
2014-07-27 21:40:43 +02:00
Dominik Schürmann
0f87b81158
Load QR Code asynchronously and with a fade in animation
2014-07-27 20:58:25 +02:00
Dominik Schürmann
57d9c7a013
Open keyboard on passphrase dialog, this should now work on all Android versions... hopefully
2014-07-27 20:42:39 +02:00
Dominik Schürmann
97e8faa1dd
Make PassphraseCacheService a foreground service
2014-07-27 18:56:23 +02:00
Dominik Schürmann
0403cbf11a
Prettify buttons
2014-07-27 18:12:14 +02:00
Dominik Schürmann
dab540e121
Work on first time wizard design
2014-07-27 17:56:52 +02:00
Vincent Breitmoser
f4ee71e3ef
introduce EditKeyResult with transient UncachedKeyRing (half-baked!)
2014-07-27 01:22:10 +02:00
Vincent Breitmoser
a8782272b3
some more work on supertoast and result parcel stuff
2014-07-27 00:46:38 +02:00
Vincent Breitmoser
8132b9ac74
Merge branch 'master' into ditch-appmsg
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2014-07-26 23:06:32 +02:00
Vincent Breitmoser
45722d7cfb
canonicalize: couple of fixes
2014-07-26 22:16:33 +02:00
Vincent Breitmoser
236a502ea7
generic UncachedKeyRing fixes
2014-07-26 15:51:35 +02:00
Vincent Breitmoser
043ed600e6
Merge remote-tracking branch 'origin/master'
2014-07-26 03:59:12 +02:00
Vincent Breitmoser
7296ac4849
UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings
2014-07-26 03:57:54 +02:00
Vincent Breitmoser
7fe1b00080
fixes for extractPublicKeyRing, update SpongyCastle
2014-07-26 03:56:28 +02:00
Vincent Breitmoser
ab2b90342e
test and fix: adding an empty user id should fail
2014-07-26 03:47:29 +02:00
mar-v-in
1e4f0c6b00
Make DecryptFragment abstract, as it should be
2014-07-25 13:39:54 +02:00
Dominik Schürmann
5eb414a22b
Program flow fixes
2014-07-25 01:34:29 +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
Dominik Schürmann
afd6851e5b
Fix test
2014-07-21 15:25:09 +02:00
Dominik Schürmann
2f5c73746d
Merge branch 'master' into yubikey
2014-07-21 15:11:59 +02:00
Dominik Schürmann
d882572f0d
NFC Yubikey: only pass through hash of message and not whole content
2014-07-21 15:10:29 +02:00
mar-v-in
2913a78b18
Load of rework on EncryptActivity, still some TODOs
2014-07-20 17:09:34 +02:00
Vincent Breitmoser
cd1511a4e6
canonicalize: fix for tests
2014-07-19 02:19:15 +02:00
Dominik Schürmann
a10f582513
Merge branch 'master' into yubikey
2014-07-18 09:56:39 +02:00
Dominik Schürmann
b332aacabb
Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master
...
Conflicts:
OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
2014-07-18 09:49:20 +02:00
Daniel Albert
db002bde7c
Fixed another unescaped apostrophe.
2014-07-17 21:17:39 +02:00
Daniel Albert
8a8d8c5a68
Fixed unescaped apostrophe
2014-07-17 20:53:10 +02:00
Dominik Schürmann
f2a6064e38
Fixes
2014-07-17 20:29:07 +02:00
Daniel Albert
01046fc0e7
Added description to Setting, Changed title to suggested one
2014-07-17 20:01:53 +02:00
Daniel Albert
d63534d655
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
2014-07-16 18:49:16 +02:00
Daniel Albert
e375cde7e1
Final Commit for #662
2014-07-16 18:17:46 +02:00
Dominik Schürmann
82af9672fd
Temporary program flow fixes
2014-07-16 10:07:50 +02:00
Dominik Schürmann
77d04a915b
Simple create key
2014-07-16 10:05:00 +02:00
Dominik Schürmann
57f5a788fd
Simple create key
2014-07-16 10:04:48 +02:00
Dominik Schürmann
c1c831e52b
New first time screen
2014-07-16 09:49:37 +02:00
Dominik Schürmann
d3c54d5f12
Fallback if no primary user id exists
2014-07-16 00:22:45 +02:00
Vincent Breitmoser
64b87f75be
move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)
2014-07-15 19:47:52 +02:00
Dominik Schürmann
848043a481
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-15 19:34:01 +02:00
Vincent Breitmoser
501d4b887a
signatures: a revocation reason does NOT determine if a cert is a revocation type
2014-07-15 19:31:27 +02:00
Dominik Schürmann
503b146a14
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-15 19:22:44 +02:00
Dominik Schürmann
72237a0892
some fixes for edit
2014-07-15 19:22:40 +02:00
Vincent Breitmoser
29145e49c9
merge: different msg if nothing was merged
2014-07-15 19:17:08 +02:00
Vincent Breitmoser
858fe47d46
Merge remote-tracking branch 'origin/master' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-07-15 17:39:36 +02:00
Daniel Albert
c101ee0240
Merge remote-tracking branch 'upstream/master' into feature-conceal-software
2014-07-13 15:39:16 +02:00
Dominik Schürmann
0ce9c13132
Fix strings from 'keys' to 'passphrases'
2014-07-12 21:07:29 +02:00
Dominik Schürmann
af5fddab7c
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-12 21:04:57 +02:00
Dominik Schürmann
45dfb39749
more work on edit key
2014-07-12 20:39:23 +02:00
Daniel Albert
bd909375c2
Fixed misplaced bracket
2014-07-12 19:24:51 +02:00
Daniel Albert
92c66743e0
Added Preference for concealing the PgpApplication
2014-07-12 19:19:12 +02:00
Daniel Albert
066591dab1
Wello there, That's Java, not C^^
2014-07-12 18:53:52 +02:00
Daniel Albert
079194abe5
Fixed issues discussed in #713
2014-07-12 18:12:03 +02:00
Daniel Albert
7a3fe61a1f
Put text into strings.xml, for internationalization
2014-07-12 12:52:44 +02:00
Daniel Albert
2568ea4b2e
Added Purging for Android < 4.1
2014-07-12 12:42:48 +02:00
Daniel Albert
cf40517eac
Implemented Notification, no fallback yet
2014-07-12 12:27:19 +02:00
Daniel Albert
af90db96a5
new PassphraseCache, storing UserIDs as well
2014-07-12 10:51:12 +02:00
Vincent Breitmoser
f82093c666
modifyKey: error out on integrity check fails
2014-07-12 02:02:37 +02:00
Vincent Breitmoser
0e3327c65c
createKey: better logging, handle empty user id case
2014-07-12 01:29:06 +02:00
Vincent Breitmoser
54bc874ce5
Merge remote-tracking branch 'origin/master' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
2014-07-11 21:00:26 +02:00
Vincent Breitmoser
20b28b5207
modifyKey: proper expiry check during SubkeyAdd
2014-07-11 15:42:02 +02:00
Vincent Breitmoser
7b195ac2e3
modifyKey: make SubkeyChange operations work
2014-07-11 15:20:16 +02:00
Vincent Breitmoser
1436ab8d90
SaveKeyringParcel: follow attribute m prefix coding guideline
2014-07-11 13:51:36 +02:00
Vincent Breitmoser
bb92fe2804
test: get rid of some SaveKeyringParcel boilerplate
2014-07-11 13:49:17 +02:00
Vincent Breitmoser
26f6d58284
get rid of some inspection warnings
2014-07-11 13:45:06 +02:00
Vincent Breitmoser
4da273ac16
modifyKey: error out on nonexisting new primary user id
2014-07-11 13:35:48 +02:00
Vincent Breitmoser
d6f3b4b879
fix bug in canonicalization regarding subkey revocation
2014-07-11 03:27:44 +02:00
Vincent Breitmoser
f6e39b0a97
modifyKey: couple more fixes from tests
2014-07-11 02:51:13 +02:00
Vincent Breitmoser
e477577c55
some UncachedKeyRing fixes, primary user id mostly
2014-07-11 02:50:35 +02:00
Vincent Breitmoser
38ee6203ad
modifyKey: preserve master key flags
2014-07-11 02:49:51 +02:00
Vincent Breitmoser
dce2df4113
add come createKey strings
2014-07-11 02:48:54 +02:00
Vincent Breitmoser
90f546a4e8
tests: add testSubkeyAdd
2014-07-10 01:38:57 +02:00
Vincent Breitmoser
a9c3d6b507
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test
...
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
2014-07-09 16:39:26 +02:00
Vincent Breitmoser
718acbf954
put unit tests into external module (CAVEAT)
...
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
2014-07-09 16:03:30 +02:00
mar-v-in
5185492b04
Fix OperationResultParcel
...
Naming conventions save lives... or atleast make addAll() work
2014-07-09 00:10:09 +02:00
Dominik Schürmann
16498be4a2
Fix nullpointer in API, fix #693
2014-07-08 04:24:27 +02:00
Dominik Schürmann
61d0e12e8a
cleanup
2014-07-08 03:37:32 +02:00
Dominik Schürmann
daa1f5cf8e
Merge branch 'master' of github.com:open-keychain/open-keychain
2014-07-08 03:34:53 +02:00
Dominik Schürmann
5adcb7885c
Work on subkeys adapter
2014-07-08 03:34:27 +02:00
Art O Cathain
78b0c5e74a
actually provide a tostring
2014-07-07 21:38:49 +01:00
Art O Cathain
37433bd282
prevent odd ambiguous method toString error
2014-07-07 21:37:48 +01:00
Art O Cathain
51bedc2e73
(c) headers, tidy imports
2014-07-07 21:35:10 +01:00
Vincent Breitmoser
9971f9ad4c
use KeyringTestHelper.diffKeyrings method for unit test
...
Conflicts:
OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
2014-07-07 21:12:50 +01:00
Vincent Breitmoser
83e5a3d341
add diffKeyrings method
2014-07-07 21:08:48 +01:00
Vincent Breitmoser
9320d2d8a2
use KeyringTestHelper.diffKeyrings method for unit test
2014-07-07 19:02:57 +02:00
Vincent Breitmoser
23524af81d
add diffKeyrings method
2014-07-07 18:52:59 +02:00
Vincent Breitmoser
e54dd26d29
Merge remote-tracking branch 'artbristol/functional-testing-canonicalize'
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
2014-07-07 18:19:52 +02:00
Vincent Breitmoser
d8f2782293
use SuperToast instead of AppMsg in code, part 2
2014-07-07 17:35:23 +02:00
Vincent Breitmoser
2c62aa90c0
use SuperToast instead of AppMsg in code, part 1
2014-07-07 17:34:41 +02:00
Vincent Breitmoser
d044daeedd
get rid of AppMsg library
2014-07-07 17:33:25 +02:00
Art O Cathain
4fbffd7bb4
Actually test canonicalize
2014-07-06 19:43:38 +01:00
Art O Cathain
e906fe5387
add the GPG version
2014-07-06 19:43:24 +01:00
Art O Cathain
c05fd07986
data fixes
2014-07-06 19:43:24 +01:00
Art O Cathain
9032e032ff
add toString for test ease
2014-07-06 19:43:17 +01:00
Art O Cathain
5479eafd4b
actually canonicalize
2014-07-06 19:42:51 +01:00
Art O Cathain
cb64f8865c
work in progress
2014-07-06 19:42:51 +01:00
Art O Cathain
b02519ce25
add toString for test ease
2014-07-06 15:50:07 +01:00
Art O Cathain
22108cf4e2
actually canonicalize
2014-07-06 15:50:07 +01:00
Art O Cathain
80e09bd05e
work in progress
2014-07-06 15:50:07 +01:00
Art O Cathain
ccb1579864
Prefer composition to inheritance is the mantra these das
2014-07-06 15:23:39 +01:00
mar-v-in
fdf6411d5f
Merge branch 'master' into improve-file-more
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/res/layout/encrypt_content.xml
2014-07-06 02:24:34 +02:00
mar-v-in
1b0666e9de
Many changes to file ... and still incomplete
...
- Multi file
- Reworked UI
2014-07-06 02:10:35 +02:00
Dominik Schürmann
3363507be4
Bett API string
2014-07-04 09:52:25 +02:00
Dominik Schürmann
709196f774
Use strings in edit key
2014-07-03 16:49:25 +02:00
Dominik Schürmann
e006d4762c
Pull from transifex
2014-07-03 16:38:22 +02:00
Dominik Schürmann
9e56e53cf1
Pull from transifex
2014-07-03 16:30:41 +02:00
Dominik Schürmann
3085f0d229
Small strings fix
2014-07-03 16:24:10 +02:00
Dominik Schürmann
1ba41e7482
Remove old edit button, rename activities
2014-07-03 16:21:16 +02:00
Dominik Schürmann
bd7b4ccf2b
cleanup, debug for passphrase set
2014-07-03 15:58:03 +02:00
Dominik Schürmann
6ca9d8a268
fix no passphrase check
2014-07-03 15:54:07 +02:00
Dominik Schürmann
b9d2ae938a
Cache passphrase for edit
2014-07-03 15:49:46 +02:00
Dominik Schürmann
2988ac6e7b
Cache passphrase for edit
2014-07-03 15:48:46 +02:00
Dominik Schürmann
85dde66804
parcel newPassphrase
2014-07-03 15:28:45 +02:00
Dominik Schürmann
9cbf78f7ad
cleanup
2014-07-03 15:24:04 +02:00
Dominik Schürmann
42cc8b687b
edit key: subkey adapter
2014-07-03 15:14:06 +02:00
Dominik Schürmann
55f067b063
Work on edit
2014-07-03 15:06:05 +02:00