moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-18 13:22:17 -05:00
Code Issues Releases Wiki Activity
2,066 Commits 12 Branches 24 Tags 116 MiB
63861fa60b
Commit Graph

2066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5e4239a7b9 Merge branch 'certify' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
 2014-03-17 14:18:42 +01:00
Vincent Breitmoser
87004fd0ca certify: preserve user id certificates when saving secret keys 2014-03-17 14:11:32 +01:00
Vincent Breitmoser
e8ad4317a4 certs: more filters, better initial uid selection, code cosmetics 
- add three types of filters for certificate list (ui looks like crap
      there, need to work on that)
    - select uncertified uids by default in CertifyKeyActivity
    - move some code around in KeychainProvider, 's slightly less hacky now
 2014-03-17 14:10:40 +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
f192c70179 certs: green dots for verified status \o/ 2014-03-15 19:58:17 +01:00
Vincent Breitmoser
5c28da44d6 certs: provider cleanup and bugfixing 2014-03-15 19:57:55 +01:00
Vincent Breitmoser
6bacb5ff51 Merge branch 'certify' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
 2014-03-15 18:34:20 +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
8fbd77fb15 certify: preserve user id certificates when saving secret keys 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
Vincent Breitmoser
a73e91c49c Merge branch 'master' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2014-03-15 00:18:50 +01:00
gogowitczak
3abe17090e Added FAQ: specifying connection port for Keyserver. 2014-03-14 20:24:27 +01:00
Daniel Hammann
cab7a5c447 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-14 19:26:21 +01:00
Dominik Schürmann
efab1d27ac Merge pull request #417 from uberspot/master 
Make email address less restrictive and fix double user ids
 2014-03-14 07:04:32 +01:00
uberspot
985a6793c0 Fix two bugs in ImportKeys screen (issue #416) 2014-03-14 00:59:10 +02:00
uberspot
b12392594f Make email address less restrictive and add icon to show when it's correct 2014-03-14 00:02:31 +02:00
Dominik Schürmann
c737f01a72 Merge pull request #415 from uberspot/master 
final code style changes
 2014-03-13 22:12:06 +01:00
uberspot
2d0817bd74 final code style changes 2014-03-13 23:03:20 +02:00