Dominik Schürmann
|
afc20602eb
|
Fix problems in strings.xml
|
2014-09-07 21:59:57 +02:00 |
|
Vincent Breitmoser
|
0b091aa642
|
flag revoked, epired and unavailable keys in selection spinner
|
2014-09-07 18:49:29 +02:00 |
|
Dominik Schürmann
|
c026dac8fc
|
Remove table layout, use hint text for edit fields
|
2014-09-07 17:27:25 +02:00 |
|
Dominik Schürmann
|
94a47719ae
|
Put quotes around all strings, should fix transifex consistency problems, also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes)
|
2014-09-07 17:09:46 +02:00 |
|
Dominik Schürmann
|
3ba2e0b0c1
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-09-07 17:01:07 +02:00 |
|
Dominik Schürmann
|
d1e08f9305
|
Two buttons to encrypt files and text, some fixes
|
2014-09-07 17:00:58 +02:00 |
|
Vincent Breitmoser
|
fd7bdbf54f
|
add proper async check for correct passphrase to passphrasedialog
|
2014-09-07 16:54:39 +02:00 |
|
Dominik Schürmann
|
02663de191
|
Better symmetric encryption layout
|
2014-09-07 16:14:48 +02:00 |
|
Dominik Schürmann
|
0e83df21cf
|
More UI rework
|
2014-09-07 15:30:32 +02:00 |
|
Dominik Schürmann
|
0706005732
|
Fix width for encrypt to
|
2014-09-07 11:52:02 +02:00 |
|
Dominik Schürmann
|
0d1c9f7745
|
Remove file menu items from text activity
|
2014-09-06 18:06:48 +02:00 |
|
Dominik Schürmann
|
6e3973e26a
|
Add experimental support for yubikey PINs, remove caching of empty passphrases
|
2014-09-05 20:04:07 +02:00 |
|
Dominik Schürmann
|
fa9bbdd60c
|
Add yubikey default PIN preference
|
2014-09-05 19:40:04 +02:00 |
|
Dominik Schürmann
|
2a9b083012
|
Safeslinger: icon, about info
|
2014-09-04 21:12:25 +02:00 |
|
Dominik Schürmann
|
d0f46f1efb
|
Integrate safeslinger share
|
2014-09-04 12:54:16 +02:00 |
|
Dominik Schürmann
|
65da538a15
|
Fix strings
|
2014-09-02 18:52:28 +02:00 |
|
Dominik Schürmann
|
fe2c17cdeb
|
Pull from transifex
|
2014-09-02 14:11:10 +02:00 |
|
Dominik Schürmann
|
0c437acd43
|
Catch security exception, known problem...
|
2014-09-02 13:51:09 +02:00 |
|
Vincent Breitmoser
|
e0905a3afb
|
cache key s2k type in database, for later use
|
2014-09-02 01:24:16 +02:00 |
|
Vincent Breitmoser
|
f8625f5310
|
rename EncryptMessageFragment -> EncryptTextFragment
|
2014-09-01 23:46:14 +02:00 |
|
Vincent Breitmoser
|
2ead78a1e5
|
split EncryptActivity into Encrypt{Text,File}Activity
|
2014-09-01 23:25:03 +02:00 |
|
Vincent Breitmoser
|
e26d7be7de
|
remove "sign" and "verify" from drawer texts
|
2014-09-01 22:07:14 +02:00 |
|
Vincent Breitmoser
|
6b5e65253c
|
small ui changes in encrypt
|
2014-09-01 21:43:15 +02:00 |
|
Vincent Breitmoser
|
6a3e7921cf
|
remove "by holding..." explanation from button text
|
2014-09-01 21:24:24 +02:00 |
|
Dominik Schürmann
|
42acb12059
|
Fix transifex linebreaks by adding apostrophs to strings with linebreaks
|
2014-09-01 16:00:50 +02:00 |
|
Dominik Schürmann
|
40e6b24b14
|
Prepare API for OpenPgpSignatureResult extensions
|
2014-08-31 23:50:04 +02:00 |
|
Dominik Schürmann
|
9a18635b89
|
Changelog 2.9
|
2014-08-31 22:12:52 +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
|
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
|
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
|
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 |
|
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
|
9288e4f0a9
|
Fix RuntimeException in KeyListActivity on tablets
|
2014-08-28 10:37:01 +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
|
79c4d3ea49
|
Pull from transifex
|
2014-08-22 09:54:01 +02:00 |
|
Dominik Schürmann
|
3acbe9052f
|
Add ECDH and ECDSA values
|
2014-08-21 15:40:09 +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
|
41052d6f8f
|
Pull from transifex
|
2014-08-21 00:36:15 +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 |
|
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 |
|
Vincent Breitmoser
|
dd1b27b28f
|
consolidate: small ui things
|
2014-08-20 21:52:54 +02:00 |
|
Vincent Breitmoser
|
c296529049
|
modifyKey: small logging changes
|
2014-08-20 20:15:43 +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 |
|
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 |
|
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
|
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
|
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
|
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
|
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
|
c00343d516
|
modify*Key: improve handling of passphrase modification (add tests, too)
|
2014-08-16 21:04:43 +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
|
28df004cbb
|
Merge pull request #767 from mar-v-in/issue-763
Use dropdown in CertifyActivity
|
2014-08-14 18:53:40 +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 |
|
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
|
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
|
e72e47d92e
|
Remove support for v3 sig generation
|
2014-08-14 15:24:37 +02:00 |
|
Dominik Schürmann
|
d0987edab9
|
Dont write version header by default
|
2014-08-14 11:44:47 +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
|
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
|
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
|
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
|
369f6e080c
|
Refactor expiry dialog
|
2014-08-05 15:07:11 +02:00 |
|
Dominik Schürmann
|
80408460a0
|
KeychainContract: use longs instead of String, other fixes
|
2014-08-05 00:23:04 +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
|
e87c69647c
|
Even more smaller nitpicks
|
2014-08-04 15:40:34 +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
|
4979ccd645
|
Smaller UI fixes
|
2014-08-04 00:49:16 +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
|
c9b028804c
|
Add user id with dialog
|
2014-08-01 17:47:07 +02:00 |
|
mar-v-in
|
0568632f32
|
Merge branch 'master' into improve-file-more
|
2014-08-01 10:32:20 +02:00 |
|
Dominik Schürmann
|
d2f50eb60f
|
identity instead of credentials
|
2014-08-01 09:34:07 +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 |
|
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 |
|
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
|
db70fcfdbf
|
Create key: design fixes
|
2014-07-31 23:13:29 +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
|
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 |
|
Dominik Schürmann
|
cc034a0913
|
Exception handling with keyserver queries
|
2014-07-31 17:56:47 +02:00 |
|
Dominik Schürmann
|
9475285013
|
Better exception handling for import of keys
|
2014-07-31 17:11:06 +02:00 |
|