moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-25 10:12:18 -05:00
Code Issues Releases Wiki Activity
635 Commits 5 Branches 73 Tags 39 MiB
31657974bf
Commit Graph

422 Commits

Author SHA1 Message Date
Daniel Gultsch
3b8446e6d5 link to openkeychain from contact details 2014-05-09 20:47:03 +02:00
Daniel Gultsch
a14a28973a nicer descriptions in notificaton for images and encrypted messages 2014-05-09 20:46:43 +02:00
Dominik Schürmann
8a2da100d5 Improve OTR fingerprint dialog and fix german sentence 2014-05-08 19:03:32 +02:00
Daniel Gultsch
c555a9d03c sending text message after returing from pending intent 2014-05-08 17:31:53 +02:00
Daniel Gultsch
7fa61564b8 better flow after returning from openkeychain for various actions 2014-05-08 16:52:19 +02:00
Daniel Gultsch
99a56a2bde offer to announce pgp key if pgp encryption is selected from menu 2014-05-08 14:35:21 +02:00
Daniel Gultsch
0ed29c1c77 more informative dialog if contact doesn't announce public key 2014-05-08 14:23:09 +02:00
Daniel Gultsch
dc73a25ae4 code cleanup 2014-05-08 11:53:00 +02:00
Daniel Gultsch
0d8bf660db fixed download button on pgp images 2014-05-08 10:14:12 +02:00
Daniel Gultsch
daa000dd75 improved next encryption selection 2014-05-07 13:09:40 +02:00
Daniel Gultsch
247f45f46b remembering text. awesome 2014-05-07 12:59:15 +02:00
Daniel Gultsch
12a3865c47 correct status after error iq 2014-05-07 12:58:57 +02:00
Daniel Gultsch
955b7dbc7e wee bit of code cleanup 2014-05-07 12:33:55 +02:00
Daniel Gultsch
461f2ffb16 basic pgp encrypted file transfer 2014-05-06 21:34:30 +02:00
Daniel Gultsch
f7033cb7e0 content name and creator are properly set 2014-05-03 18:47:53 +02:00
Daniel Gultsch
2df57f38a0 properly reply to iq requests. reply to disco 2014-05-03 17:42:44 +02:00
Daniel Gultsch
4822d4dce7 allow roster pushes only from bare jid or null 2014-05-03 17:07:37 +02:00
Daniel Gultsch
3cfb4a0cd6 added restart button to openkeychain dialog 2014-05-03 15:24:19 +02:00
Daniel Gultsch
82bccedf70 nicer dialog screen if openkeychain is not installed 2014-05-02 12:02:18 +02:00
Daniel Gultsch
37c8e157d0 reworked openpgp integration part #1 2014-05-01 22:33:49 +02:00
Daniel Gultsch
4b66b4b5d1 bug fix for jingle 2014-04-26 17:26:22 +02:00
Daniel Gultsch
f36f218469 unified presence selection for otr and file transfer 2014-04-26 12:40:21 +02:00
Daniel Gultsch
a55ddb889e fixed #75 2014-04-25 23:14:43 +02:00
Daniel Gultsch
6942840061 setting backround color if image comes directly from cache 2014-04-25 23:09:15 +02:00
Daniel Gultsch
645139eb68 couple of more optimazations on image loading 2014-04-25 23:06:20 +02:00
Daniel Gultsch
bf2d0d5596 smoother scrolling (first step) 2014-04-25 16:24:56 +02:00
Daniel Gultsch
18c183a767 deny files with unknown file types 2014-04-23 21:19:56 +02:00
Daniel Gultsch
9a8e55acd1 added download button for images not accepted automatically 2014-04-22 18:46:40 +02:00
Daniel Gultsch
aa5f775fc7 added support for ibb 2014-04-22 13:11:53 +02:00
Daniel Gultsch
d151ad9031 code cleanup 2014-04-21 20:39:57 +02:00
Daniel Gultsch
77da0c6b5d allow images to be opened with gallary app 2014-04-21 19:51:03 +02:00
Daniel Gultsch
fc6a16c31b added missing transport id 2014-04-21 12:03:26 +02:00
Daniel Gultsch
4d730fd1ed added proxy activate and a lot of code clean up. totatly untested 2014-04-20 22:34:27 +02:00
Daniel Gultsch
04418484a2 made our spanish friends happy. fixed #68 2014-04-20 20:53:36 +02:00
Daniel Gultsch
d140ef6390 fixed #50 2014-04-20 20:48:16 +02:00
Daniel Gultsch
8003e53013 more jingle bug fixes 2014-04-19 11:58:35 +02:00
Daniel Gultsch
7299fe7c8b fixed replace contact in conversation 2014-04-19 02:58:34 +02:00
Daniel Gultsch
8c59668273 made debugging verbose again on specific parts 2014-04-19 02:19:26 +02:00
Daniel Gultsch
1235e3daca fixed default autoaccept file size and wrongly marked message 2014-04-19 01:51:50 +02:00
Daniel Gultsch
5c0873c7ca cleaned up debug log a little bit 2014-04-19 01:14:30 +02:00
Daniel Gultsch
7ccbf0008a fixed concurrent modification of contacts which led to missing presences 2014-04-18 21:26:01 +02:00
Daniel Gultsch
1e5f916b2a tried to avoid some more race conditions in jingle 2014-04-18 11:57:28 +02:00
Daniel Gultsch
625fbe7d81 Merge branch 'master' into development 2014-04-18 01:07:45 +02:00
Daniel Gultsch
18c0c31b65 work around for bug in xmlpullparser 2014-04-18 00:33:00 +02:00
Daniel Gultsch
07cf07ad58 lot of cleanup in jingle part 2014-04-18 00:17:34 +02:00
Daniel Gultsch
8006931f80 put more string into strings.xml 2014-04-18 00:17:34 +02:00
Daniel Gultsch
0de0cb90a0 fixed destination bug 2014-04-18 00:17:34 +02:00
Daniel Gultsch
e29ce19f20 fixed #63 2014-04-18 00:17:34 +02:00
Daniel Gultsch
a04d736f75 fixed possible race conditions with presences 2014-04-18 00:17:34 +02:00
Daniel Gultsch
4a36abf30f added clear history dialog (no funcionality) 2014-04-18 00:17:34 +02:00
Daniel Gultsch
e711da7248 jingle sessions now get terminated proberly on success 2014-04-16 12:50:53 +02:00
Daniel Gultsch
bdf9770a61 made ui with sending images a little smoother 2014-04-15 15:19:02 +02:00
Daniel Gultsch
513f3c47b2 added very basic, very untested gui on the receiving side 2014-04-14 21:21:13 +02:00
Daniel Gultsch
18c3333271 tried to fix some race conditions. not adding duplicate candidates. needs more checks though 2014-04-14 20:35:11 +02:00
Jelmer Vernooij
802c21a793 Fix two typos: assoziated -> associated. 2014-04-14 02:22:03 +02:00
Andreas Straub
e4f9a38c76 Some icon tweaks 
Use Roboto Light, thinner lines between tiles, slightly smaller letters
 2014-04-13 21:13:37 +02:00
Andreas Straub
132689376c Added ellipsis tile for large conversations 
For more than 4 members in a conversation, the fourth tile now contains
an ellipsis to indicate this
 2014-04-13 21:13:37 +02:00
Andreas Straub
901ce085a7 Major Contact Picture code cleanup 
Notifications now have pseudotransparent icons, icons are generated in
the correct size.
 2014-04-13 21:13:37 +02:00
Daniel Gultsch
084ab51b1d transmitting files between two conversations works. no error handling and no ui on the receiving end 2014-04-13 21:10:36 +02:00
Daniel Gultsch
7dfe4ae082 some code cleanup. added setting to auto accept files. socks5 connections are now threaded 2014-04-13 18:09:40 +02:00
Daniel Gultsch
27d5966ac3 more efficant way of calculating the sha1 sum. closing connections 2014-04-13 11:32:45 +02:00
Daniel Gultsch
7b554f2001 fixed minor typos 2014-04-12 10:45:25 +02:00
Daniel Gultsch
f57b669f83 Merge branch 'development' of https://github.com/strb/Conversations into strb-development 2014-04-12 10:22:18 +02:00
Daniel Gultsch
d936a830e4 add sha1 sum to file 2014-04-12 10:02:48 +02:00
andy
f3b07250dd Added tiled MUC icons 
Now, MUCs have icons with up to 4 tiles representing MUC members,
similar to the gmail app.

Some caveats:
As of now, no ordering is imposed on the members, we simply pick the
first (up to) 4 returned by the MucOptions object. This could be done
better, e.g. by picking more important members first (based on
affil/role), or even going so far as to order them by how recently they
sent a message in the MUC.
Also, the code generating the tiles is really messy right now (tons of
copy and paste). It seems to work though. I will clean this up soon.
 2014-04-12 03:47:05 +02:00
andy
c230733736 More Contact Picture refactors 
Use polymorphism to avoid dynamic dispatch based on nulled parameters.
Next up: Prettier MUC icons
 2014-04-12 03:46:54 +02:00
andy
3d6f03e859 Refactor UIHelper to use getContactPicture 
Normalize the interface, reduce code duplication
 2014-04-12 03:46:43 +02:00
Daniel Gultsch
96be96f9f8 open latest conversation from notification 2014-04-11 23:05:45 +02:00
Daniel Gultsch
259bb446ca first file transfer between gajim and conversations. still a lot to do though 2014-04-11 22:49:26 +02:00
Daniel Gultsch
c0e0a70869 socks5 initialisation works. doesn't get activate though 2014-04-11 21:13:09 +02:00
Daniel Gultsch
51100ab48b failed messages get now marked inline 2014-04-11 09:13:56 +02:00
Daniel Gultsch
644473205a incomming jingle packets are routed to their connection. added presence chooser in gui 2014-04-10 14:12:08 +02:00
Daniel Gultsch
ba0bedc5fa changed behaviour of expecption handler to check if accounts are working before removing the stacktrace 2014-04-10 13:19:58 +02:00
Daniel Gultsch
298c7adcd1 disocover stream hosts (xep-0065) cleaned up disco 2014-04-08 23:15:55 +02:00
Daniel Gultsch
92dcf85701 fixed npe 2014-04-08 10:23:05 +02:00
Daniel Gultsch
78bd6c423f fixed #52. thanks @strb 2014-04-07 23:58:59 +02:00
Daniel Gultsch
3f403fb8a9 jingle connection and manager. able to trigger dialog in gajim 2014-04-07 20:05:45 +02:00
Daniel Gultsch
c30bf75a5d gui for images 2014-04-06 15:34:08 +02:00
Daniel Gultsch
9fc7a1b980 added button to open images 2014-04-06 15:28:19 +02:00
Daniel Gultsch
7749103909 added attach file action 2014-04-06 15:28:19 +02:00
Daniel Gultsch
cc977eee90 renamed [Archive conversation|Leave conference] to End this conversation 2014-04-06 15:23:40 +02:00
Daniel Gultsch
3f872ddc9f fixed npe 2014-04-06 15:22:56 +02:00
Daniel Gultsch
486f198632 use proper, advertised sm namespace 2014-04-05 12:08:35 +02:00
Daniel Gultsch
83a23ad3b1 cleaned up log output a little bit 2014-04-05 11:59:18 +02:00
Rene Treffer
c82c6251b8 Switch to FULL_SYNC to make prosody happy 2014-04-05 11:39:45 +02:00
Daniel Gultsch
850b24c4db code cleanup 2014-04-05 09:45:15 +02:00
Daniel Gultsch
ee24baa0fd marked incoming carbons as unread 2014-04-04 22:52:32 +02:00
Daniel Gultsch
34bd79ac04 notify on incomming received carbon messages 2014-04-04 17:58:53 +02:00
Daniel Gultsch
caf214c212 fixing more notification f-ups 2014-04-04 13:01:07 +02:00
Daniel Gultsch
db4559efdf nothing important 2014-04-03 23:57:26 +02:00
Daniel Gultsch
bd9dba1a69 Merge branch 'compression' of https://github.com/rtreffer/Conversations into rtreffer-compression 2014-04-03 23:50:48 +02:00
Daniel Gultsch
91aeffae1b possible fix for some weird notification bugs 2014-04-03 23:50:34 +02:00
Rene Treffer
a0fc1c6c77 Migrate all accounts to use compression 2014-04-03 22:28:37 +02:00
Rene Treffer
4ea11c15e3 Only apply defaults if the account is new 2014-04-03 21:25:03 +02:00
Rene Treffer
5684849249 Remove option to enable/disable TLS (now enabled by default) 2014-04-03 21:22:17 +02:00
Rene Treffer
e6797e1db4 Remove option for compression (enabled by default / hidden setting) 2014-04-03 20:54:50 +02:00
Rene Treffer
7db21136a3 Add support for users with empty name 2014-04-03 18:37:48 +02:00
Rene Treffer
9502ff25dd Add compression support 2014-04-03 18:37:25 +02:00
Daniel Gultsch
2506ef82df be compatible with openkeychain api v3 2014-04-03 17:39:57 +02:00
Daniel Gultsch
10f71c53c8 increased version and fixed one last null pointer 2014-04-03 15:24:11 +02:00
Daniel Gultsch
b91c9afe4b call change status listener after disable account 2014-04-03 15:13:43 +02:00
Daniel Gultsch
217d18b6ac fixed null pointer 2014-04-03 15:08:53 +02:00
Daniel Gultsch
9d2d853e1b fixed #27 2014-04-03 14:25:54 +02:00
Daniel Gultsch
e70c0cfffd Merge pull request #40 from rtreffer/minidns 
Add ability to use a provided ipv4 address on connect
 2014-04-03 11:13:45 +02:00
Rene Treffer
eae4e5d518 Add ability to use a provided ipv4 address on connect 2014-04-03 11:01:20 +02:00
Daniel Gultsch
01925fb2cc tryping to resolve the wake lock bug 2014-04-03 10:41:21 +02:00
Daniel Gultsch
2b8dfc2bab cleared up logging a little bit. no need for an entire stack trace at this point 2014-04-03 10:12:50 +02:00
Daniel Gultsch
2efb97efa0 Merge pull request #39 from rtreffer/minidns 
Switch to a small DNS library for DNS resolving.
 2014-04-03 09:50:57 +02:00
Rene Treffer
ff88dc0eaa Switch to a small DNS library for DNS resolving. 2014-04-03 09:42:58 +02:00
Daniel Gultsch
21be7bc160 added permenant notification when one or more accounts are unable to connect 2014-04-03 09:21:45 +02:00
Daniel Gultsch
d53dc28f4c fixed add account dialog showing up multiple times 2014-04-01 23:16:19 +02:00
Daniel Gultsch
1fe49a0545 fixed digest-md5 auth to work with prosody as well. thank you Florian Schmaus 2014-04-01 11:38:34 +02:00
Daniel Gultsch
601e5ca33e fixed #30 - added support for digest-md5 - only works with Icewarp 11???git add src/? 2014-03-31 15:22:27 +02:00
Daniel Gultsch
aed5b01434 changed all them beautifull colors 2014-03-31 11:11:17 +02:00
Daniel Gultsch
6bb7764d72 null pointer fix 2014-03-31 09:45:39 +02:00
Daniel Gultsch
92e0713373 null pointer fix 2014-03-31 09:43:58 +02:00
Daniel Gultsch
ad3e23fa7c ground work to support multiple auth mechanisms 2014-03-30 21:21:55 +02:00
Daniel Gultsch
e8290d52b1 finally fixed #notificationgate 2014-03-29 20:29:03 +01:00
Daniel Gultsch
38efb84690 treat dns timeouts as temporary. also increased timeout 2014-03-28 19:00:01 +01:00
Daniel Gultsch
268eae7813 fixed login issue with latest ejabberd 2014-03-28 18:31:04 +01:00
Daniel Gultsch
a649310fe2 streamlined sasl code 2014-03-28 14:48:11 +01:00
Daniel Gultsch
f457c629ee fixed another null pointer reported by he crash reporter. this thing is awesome 2014-03-28 13:32:36 +01:00
Daniel Gultsch
b966464324 fixed null pointer issue 2014-03-28 12:58:40 +01:00
Daniel Gultsch
0b235171a8 tryping to fix #24 - notificationgate - since i still cant reproduce this patches are all blind 2014-03-28 12:22:09 +01:00
Daniel Gultsch
ea766d970f crash reporter 2014-03-27 16:09:23 +01:00
Daniel Gultsch
592068e7cf code cleanup 2014-03-27 14:41:01 +01:00
Daniel Gultsch
8988873d77 more dns fixes. hopefully the last 2014-03-27 14:31:55 +01:00
Daniel Gultsch
800c18956b dont add new muc to roster 2014-03-27 11:41:32 +01:00
Daniel Gultsch
291dc4c36c fixed null pointer with missing status msg 2014-03-27 11:09:50 +01:00
Daniel Gultsch
f99887d7ca further dns improvements 2014-03-27 11:03:10 +01:00
Daniel Gultsch
4864f7200b fixed a couple of muc issues. added jingle listener (which doesn't do anything for now) 2014-03-27 02:02:59 +01:00
Daniel Gultsch
185d4d120b fixed error with leaving mucs 2014-03-26 18:56:02 +01:00
Daniel Gultsch
0c37abf1e9 made work around not being a work around any more 2014-03-26 00:17:26 +01:00
Daniel Gultsch
39c651a236 fixed settings opening twice from manage accounts activity 2014-03-25 18:38:20 +01:00
Daniel Gultsch
956b646e2a more srv lookup fixes 2014-03-25 18:12:27 +01:00
Daniel Gultsch
0b9e089ac6 using actual dns servers provided by the system 2014-03-25 17:21:56 +01:00
Daniel Gultsch
10f2231bcf fixed array out of bounds 2014-03-25 17:08:52 +01:00
Daniel Gultsch
1b3c288225 holding wake locks during onStartCommand 2014-03-23 14:15:14 +01:00
Daniel Gultsch
ee1c9e611b more otr fixes 2014-03-21 23:09:14 +01:00
Daniel Gultsch
a9e34d3492 tryed to fix more otr bugs. new resource setting 2014-03-21 22:14:52 +01:00
Daniel Gultsch
079712060c otr safety guard 2014-03-21 21:25:28 +01:00
Daniel Gultsch
bbfe102e91 sending offline msgs 2014-03-21 19:58:47 +01:00
Daniel Gultsch
36dccb9f77 fixed users profile picture 2014-03-21 14:58:33 +01:00
Daniel Gultsch
b6ea028a9d added no-copy 2014-03-20 15:49:53 +01:00
Daniel Gultsch
6be2a08f19 otr messages are now ignored if conversations isnt 100% sure the message is ours 2014-03-19 16:16:40 +01:00
Daniel Gultsch
389d4db311 rename in muc fixed 2014-03-19 15:05:01 +01:00
Daniel Gultsch
3a98a695d4 fix bug with presences with no resource attached 2014-03-18 14:35:19 +01:00
Daniel Gultsch
0116551ca9 bug fixes with leaving muc on connection loss. 2014-03-16 14:12:30 +01:00
Daniel Gultsch
8cd59bb944 better muc invitations. clearified the creation of ad hoc mucs with an alert dialog 2014-03-15 15:13:35 +01:00
Daniel Gultsch
841c6e04a9 muc invites in conference details 2014-03-15 06:20:59 +01:00
Daniel Gultsch
afe1244709 muc creation 2014-03-15 04:59:18 +01:00
Daniel Gultsch
8f9712c64e added security indicator on every single message 2014-03-15 00:19:42 +01:00
Daniel Gultsch
b0d57d01c4 renaming conferences over conference details 2014-03-14 23:32:48 +01:00
Daniel Gultsch
b1a3d09ca6 use conference subject to identiy room 2014-03-14 22:40:56 +01:00
Daniel Gultsch
4e4a767743 added display of own fingerprint 2014-03-14 21:36:38 +01:00
Daniel Gultsch
bae7418756 fixed logic bug with cleaning of presences 2014-03-14 20:43:54 +01:00
Daniel Gultsch
29e128513d nick name more persistant than ever before 2014-03-14 20:19:58 +01:00
Daniel Gultsch
cc65567366 workaround for some weird clients sending empty string over otr 2014-03-14 19:31:15 +01:00
Daniel Gultsch
1bdbeb620f renaming in mucs now persistent 2014-03-14 19:12:24 +01:00
Daniel Gultsch
4e20b81bd9 fixed problem with null messages. added ask again button 2014-03-14 18:56:52 +01:00
Daniel Gultsch
71cb5548eb removed log output 2014-03-13 22:14:20 +01:00
Daniel Gultsch
bf7bba0311 bug fix 2014-03-13 21:45:38 +01:00
Daniel Gultsch
9c811f8fb2 sharing text 2014-03-13 21:37:27 +01:00
Daniel Gultsch
507cfba6ad fixed logic bug where presences where cleared to early 2014-03-13 18:36:56 +01:00
Daniel Gultsch
748582e3ab start converstaion from address book (sendto) 2014-03-13 18:18:41 +01:00
Daniel Gultsch
678dbd37c6 finished registration 2014-03-13 17:29:22 +01:00
Daniel Gultsch
53fa87b414 removed unnecessary uihelper method 2014-03-13 13:28:16 +01:00
Daniel Gultsch
eec3906692 fixed bug where one couldnt short click to edit in the account list 2014-03-13 04:32:19 +01:00
Daniel Gultsch
6db012ac6f ui for registry. 2014-03-13 04:21:59 +01:00
Daniel Gultsch
a80e3131be contact picture generation centralized + basic registry stuff 2014-03-13 03:52:41 +01:00
Daniel Gultsch
eadebeb77c added server info and deal with thi 'connecting...' bug 2014-03-12 22:31:50 +01:00
Daniel Gultsch
c67238562a fixed #9 2014-03-12 19:56:06 +01:00
Daniel Gultsch
848fb2ec24 fix for otr problems 2014-03-12 19:47:42 +01:00
Daniel Gultsch
d943e218a4 make conference notificaton optional 2014-03-12 14:55:23 +01:00
Daniel Gultsch
33f8747b87 notifications support vibration now 2014-03-12 01:49:11 +01:00
Daniel Gultsch
01e2a3a4cd display contact picture in notification 2014-03-11 21:56:37 +01:00
Daniel Gultsch
82fa29bfc5 possible fix for #9 2014-03-11 17:47:05 +01:00
Daniel Gultsch
11a8a747e3 fixed bug with disabling accounts 2014-03-11 16:49:42 +01:00
Daniel Gultsch
838270432f cleaner/better logging 2014-03-11 16:27:33 +01:00
Daniel Gultsch
0d516b0603 ping stuff 2014-03-11 15:44:22 +01:00
Daniel Gultsch
08023210ba basic stream managment functionality 2014-03-11 02:53:10 +01:00
Daniel Gultsch
e441005c87 cleanup 2014-03-11 02:52:41 +01:00
Daniel Gultsch
05694b4c06 fixed null pointer 2014-03-10 22:05:25 +01:00
Daniel Gultsch
a5de5060a9 another possible fix for notificationgate 2014-03-10 21:52:58 +01:00
Daniel Gultsch
baf0d64787 exception handler 2014-03-09 13:21:28 +01:00
Daniel Gultsch
91130612d4 cleanup 2014-03-09 12:58:29 +01:00
Daniel Gultsch
d543d377b7 possible null pointer fix 2014-03-09 03:33:32 +01:00
Daniel Gultsch
a8dd6794f3 sending named presence 2014-03-09 03:24:59 +01:00
Daniel Gultsch
6ec5b2f055 possible bug fix for notificationgate 2014-03-08 21:22:54 +01:00
Daniel Gultsch
d7ab7715ed couple of otr related bug fixes and basic ping 2014-03-08 20:14:47 +01:00
Daniel Gultsch
5a4328db7d fixed #4 - this happend when you would archive (leave) the last conversation 2014-03-08 13:40:20 +01:00
Daniel Gultsch
aa31732ea3 last part. update notification if user reads them 2014-03-08 06:25:35 +01:00
Daniel Gultsch
83c5fdaf0e step three. unread if sent msg in muc arrives. to cryptic? it does awesome shit to you 2014-03-08 06:04:06 +01:00
Daniel Gultsch
9a5a429888 step two towards nicer notifications. mark read if carbon arrives 2014-03-08 05:59:31 +01:00
Daniel Gultsch
02883a7ac4 first step towards nicer notifications 2014-03-08 05:46:20 +01:00
Daniel Gultsch
fbd25c8129 roster version bug 2014-03-08 04:18:58 +01:00
Daniel Gultsch
e486f0020a cleanup 2014-03-08 02:48:20 +01:00
Daniel Gultsch
905a79fca8 fixed #3 2014-03-08 02:06:00 +01:00
Daniel Gultsch
a1b72313d7 fixed otr bug 2014-03-08 00:48:52 +01:00
Daniel Gultsch
5955da3519 fixed a couple of pgp bugs 2014-03-08 00:31:29 +01:00