Commit Graph

1558 Commits

Author SHA1 Message Date
Dominik Schürmann
4137fbff5b Merge pull request #453 from thi/452-unrevoked-keys-displayed-in-red
Fix key list views in main key view
2014-03-20 11:35:48 +01:00
Thialfihar
62fb1fb579 Fix key list views in main key view
Since the views are being reused, a revoked key might set the text
color of a view and when the view is being reused for a non-revoked
key it is still red. So grab the default text colour and set it
explicitly when the key is not revoked.
2014-03-20 00:37:03 +01:00
Dominik Schürmann
107affcb34 Merge pull request #450 from uberspot/master
add apg's fix for Key id display
2014-03-19 17:33:30 +01:00
uberspot
977e76e7e4 add apg's fix for Key id display 2014-03-19 18:28:34 +02:00
Dominik Schürmann
52838a50c1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-19 16:22:26 +01:00
Dominik Schürmann
8059c78e55 Remove oxygen text from icon 2014-03-19 16:22:22 +01:00
Dominik Schürmann
12b97d251a Cleanup 2014-03-19 16:22:10 +01:00
Dominik Schürmann
41fda151dc Merge pull request #448 from AlexanderS/lint-fixes
use correct LongSparseArray for minimum api level
2014-03-19 15:41:15 +01:00
Alexander Sulfrian
69d26496a2 use correct LongSparseArray for minimum api level 2014-03-19 14:26:00 +01:00
Dominik Schürmann
3416e51f84 Merge pull request #445 from gogowitczak/rwrsa-branch
Disabled possibility to generate weak RSA keys (512 and 1024 bit)
2014-03-19 09:40:28 +01:00
gogowitczak
19e962481d Note about blocked possibility to generate weak (<1024) RSA key. 2014-03-18 23:30:42 +01:00
gogowitczak
2435794279 Blocked ok button for generating weak (<1024) RSA key. 2014-03-18 21:52:44 +01:00
Dominik Schürmann
9d60224980 Cleanup SelectSecretKeyActivity and also return Uri 2014-03-18 19:36:59 +01:00
Dominik Schürmann
38ffa66682 Merge pull request #443 from uberspot/master
CertifyKeyActivity sets error if no key is selected
2014-03-18 19:17:50 +01:00
uberspot
654c302961 CertifyKeyActivity sets error if no key is selected 2014-03-18 20:13:39 +02:00
Dominik Schürmann
4aa24413de revert ca_necrypt patch 2014-03-18 18:35:59 +01:00
Dominik Schürmann
6a854a86dd Merge pull request #441 from uberspot/master
fix emails not showing up in import keyserver search
2014-03-18 18:27:22 +01:00
uberspot
ea648e5a43 fix emails not showing up in import keyserver search 2014-03-18 19:24:04 +02:00
Dominik Schürmann
9badff0b5b Merge pull request #434 from honnel/revocation-status
Show revocation status in ViewKeyKeysAdapter #375
2014-03-18 16:45:44 +01:00
Dominik Schürmann
b97097d8d9 Merge pull request #437 from sreeram-boyapati/encrypt
Can_Encrypt Check added to hide Button
2014-03-18 16:45:38 +01:00
Daniel Hammann
0550b22b49 Merge branch 'revocation-status' of https://github.com/honnel/openpgp-keychain into revocation-status
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
2014-03-18 16:40:22 +01:00
Sreeram Boyapati
163e9fddb9 Code Style fix 2014-03-18 21:10:09 +05:30
Daniel Hammann
2d3f47eb99 Show revocation status in SelectPublicKeyFragment #375
Added revocation status in Key List View (graphical symbol and red coloring)
2014-03-18 16:33:49 +01:00
Dominik Schürmann
fe3d6bafc3 Merge pull request #435 from sreeram-boyapati/change_passphrase
Button Text changes to Change Passphrase if Passphrase is set
2014-03-18 16:30:42 +01:00
Dominik Schürmann
eebf1c171a add mr option in keyserver class before query (code simplification) 2014-03-18 16:29:40 +01:00
Sreeram Boyapati
f34b3ee531 Button Text changes to Change Passphrase if Passphrase is set 2014-03-18 20:40:09 +05:30
Daniel Hammann
93447bf3f8 Show revocation status in SelectPublicKeyFragment #375
Added revocation status in Key List View (graphical symbol and red coloring)
2014-03-18 16:07:17 +01:00
Sreeram Boyapati
fa439c1a72 Can_Encrypt Check added to hide Button 2014-03-18 20:33:17 +05:30
Dominik Schürmann
d1f0374620 Merge pull request #424 from gogowitczak/mro-branch
Machine readable output for Keyserver query
2014-03-18 15:56:46 +01:00
gogowitczak
fee18bd33e Fixed coding style. 2014-03-18 15:44:20 +01:00
Dominik Schürmann
72a5d6d870 Merge pull request #431 from honnel/ui-modification
Ui modification
2014-03-18 14:57:32 +01:00
Dominik Schürmann
711a51f7fc Merge pull request #430 from Valodim/certify
Revamp certify dialogue
2014-03-18 14:43:20 +01:00
Dominik Schürmann
30644b5c4f Merge pull request #420 from gogowitczak/master
Added FAQ: specifying connection port for Keyserver.
2014-03-18 14:24:53 +01:00
Dominik Schürmann
77b8b870ee Merge pull request #421 from uberspot/master
Fix export for new unified key list #409 and lock drawer in tablets #255
2014-03-18 14:14:21 +01:00
Daniel Hammann
b39d37f59c #429 4)
In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second
icon hint can be 'Keyserver' or just only 'server'
2014-03-17 22:17:05 +01:00
Vincent Breitmoser
87004fd0ca certify: preserve user id certificates when saving secret keys 2014-03-17 14:11:32 +01:00
uberspot
e01c99a193 make loading of drawer items a bit more dynamic 2014-03-17 00:27:52 +02:00
uberspot
cea62b1857 Lock drawer as open in tablets 2014-03-16 23:35:14 +02:00
gogowitczak
5277e4c1e7 removed TODO comment 2014-03-15 22:01:37 +01:00
gogowitczak
207010dd86 Keyserver query now uses machine readable output for search and get. Added separate function for converting algorithm integer ID to String. 2014-03-15 21:16:34 +01:00
Vincent Breitmoser
95be228b47 certify: sign individual UIDs
direct signing of pubkeys is out for now. not sure how this should be
handled, but it's trivial to re-add so leaving this up for discussion
for now.
2014-03-15 18:20:50 +01:00
Vincent Breitmoser
a3224687f6 certify: add some subscopes in PgpKeyOperation for readability
note this commit introduces NO semantical changes whatsoever!
2014-03-15 18:20:50 +01:00
Vincent Breitmoser
1de0312bb5 certify: revamp certifykeyactivity
show info on the key to be certified, along with a list of (selectable)
user ids. user ids are handed through to the signing service, but not
yet handled.
2014-03-15 18:20:49 +01:00
Vincent Breitmoser
49984846d5 certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha) 2014-03-15 18:20:49 +01:00
Vincent Breitmoser
efc8252598 certify: viewkeyuseridsadapter cosmetics and checkbox capability 2014-03-15 18:20:49 +01:00
Vincent Breitmoser
9920196f70 certify: selectsecretkeyfragment cosmetics 2014-03-15 18:20:49 +01:00
Vincent Breitmoser
db25c56b64 certify: add certify action button to viewkeymainfragment 2014-03-15 18:20:42 +01:00
Vincent Breitmoser
0922a8cf04 move fingerprint coloring into helper 2014-03-15 02:20:28 +01:00
uberspot
e387dd7c54 Fix export for new unified key list #409 2014-03-15 01:51:01 +02:00
gogowitczak
3abe17090e Added FAQ: specifying connection port for Keyserver. 2014-03-14 20:24:27 +01:00