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
