moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-25 02:02:16 -05:00
Code Issues Releases Wiki Activity
1,817 Commits 5 Branches 73 Tags 39 MiB
f00e168752
Commit Graph

338 Commits

Author SHA1 Message Date
iNPUTmice
490f40b196 possible work around for some weird - possibly sdk - bugs 2014-12-07 21:14:13 +01:00
iNPUTmice
9c9e22c020 fixed digest-md5 2014-12-04 12:33:56 +01:00
iNPUTmice
2274c38726 close cursors after querying phone db 2014-12-03 23:29:35 +01:00
iNPUTmice
e623e28487 fixed #651 2014-12-03 17:05:37 +01:00
iNPUTmice
46e319b241 more safety checks for listener counts 2014-12-03 14:55:09 +01:00
iNPUTmice
a38005ec89 fixed #544 2014-12-03 12:33:32 +01:00
iNPUTmice
9e97529b3d version bump to 0.9.2 2014-12-03 11:18:49 +01:00
iNPUTmice
685f405154 display proper error in edit account details if jid is invalid 2014-12-03 10:52:55 +01:00
iNPUTmice
8f62d95e1f further npe checks 2014-12-03 10:45:47 +01:00
iNPUTmice
aaeba697bd refactored the message adapter a bit 2014-12-03 10:35:30 +01:00
iNPUTmice
be358b77d6 set nick and autojoin=true for new bookmarks 2014-12-03 10:34:05 +01:00
iNPUTmice
c273637156 made muc parser more compatible with legacy mucs?! (whatever that is exactly) 2014-12-03 01:46:26 +01:00
Sam Whited
feec659b08 Make sure SASL tokenizer strips strings 
Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==')
 2014-12-02 19:33:41 -05:00
iNPUTmice
46b2760069 worked around concurrent modification exception 2014-12-03 00:54:07 +01:00
iNPUTmice
4a80914603 fixed another npe in hasBookmark 2014-12-03 00:18:07 +01:00
Daniel Gultsch
138345c5bf Merge pull request #740 from SamWhited/jidrpfix 
Fix RFC 6122 implementation
 2014-12-03 00:12:36 +01:00
Daniel Gultsch
c0e997e007 Merge pull request #743 from weiss/update-german-translations 
Update/improve German translations
 2014-12-03 00:11:50 +01:00
iNPUTmice
53aaaf68d5 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-12-03 00:07:41 +01:00
iNPUTmice
eb0f8c08bd safety net in joinMuc 2014-12-03 00:06:57 +01:00
iNPUTmice
39a3f372dd clean up getProposedNick 2014-12-03 00:06:57 +01:00
iNPUTmice
9152e1ac95 fixed potential npes in message parser 2014-12-03 00:06:57 +01:00
iNPUTmice
241de062da cleaned up avatar / tile creation 2014-12-03 00:06:57 +01:00
Holger Weiß
b5b6589b44 Update/improve German translations 2014-12-02 18:02:17 +01:00
Sam Whited
29a7828c5f Allow JIDs such as "example.net/@" 2014-12-02 10:17:50 -05:00
Sam Whited
4f9dd82457 "example.net/@/" should be a valid JID. 
Retab JID file
 2014-12-02 10:09:31 -05:00
Sam Whited
3fc834c067 Fix RFC 6122 implementation 
JID resourceparts should be able to contain "@" and "/" characters
 2014-12-02 09:16:09 -05:00
Daniel Gultsch
59402da60d Merge pull request #737 from kruks23/translation2 
Update spanish translations
 2014-12-02 00:31:24 +01:00
Daniel Gultsch
85d5326c32 Merge pull request #730 from svetlemodry/development 
Updated Czech translation file
 2014-12-02 00:31:13 +01:00
kruks23
2a2679cfec Update spanish translations 2014-12-01 23:16:27 +01:00
Jaroslav Lichtblau
2f34f93c3a pref_about_message string deleted 2014-12-01 21:42:37 +01:00
Jaroslav Lichtblau
59a112ebfe Updated Czech translation file 
added missing strings
fixing typos, improvements for better understanding
 2014-12-01 16:46:17 +01:00
iNPUTmice
9dd445a507 fixed #728 2014-12-01 12:33:57 +01:00
iNPUTmice
6a429d9939 bumped cap version as well 2014-12-01 11:25:47 +01:00
iNPUTmice
8d306ac64f clear encrypted messages on reinit 2014-12-01 11:18:55 +01:00
iNPUTmice
96bbd16ca5 worked around rare npe 2014-12-01 10:58:06 +01:00
iNPUTmice
5992d4ac00 fixed npe if roster jid couldnt be parsed 2014-12-01 10:25:36 +01:00
iNPUTmice
21f77cd1e3 fixed italian translation 2014-12-01 09:59:39 +01:00
Daniel Gultsch
99e3fb814d Merge pull request #726 from Elinvention/development 
Update Italian translations
 2014-12-01 09:51:19 +01:00
iNPUTmice
a4b4c13c66 do not query service info from main server again 2014-12-01 09:48:30 +01:00
iNPUTmice
57fd763066 don't request fragment before updating 2014-11-30 22:27:11 +01:00
Elinvention
e039c8de25 Removed pref_about_message which is not translatable 2014-11-30 21:51:48 +01:00
Elinvention
6b772f4141 Added missing italian translations with some minor fixes to existing ones 2014-11-30 21:16:55 +01:00
Daniel Gultsch
52a43db6d6 Merge pull request #721 from SamWhited/warning_fixes 
Warning "fixes"
 2014-11-29 19:14:13 +01:00
Daniel Gultsch
acf446a02c Merge pull request #718 from beriain/development 
Update basque translation
 2014-11-29 19:13:26 +01:00
iNPUTmice
d98486d1ca fixed npe for broken bookmarks 2014-11-29 19:09:28 +01:00
Sam Whited
e43ac27e8f Accessibility: Add missing image descriptions 2014-11-29 08:03:35 -05:00
Sam Whited
afc673bb15 Misc. "fixes" to correct warnings. 2014-11-29 07:50:59 -05:00
iNPUTmice
1ff9293ee1 fix for concurrency issue 2014-11-29 13:09:56 +01:00
Aitor Beriain
d9182fe81c Update basque translation 2014-11-27 18:33:42 +01:00
iNPUTmice
3d8a2e7923 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-27 10:30:27 +01:00
iNPUTmice
7ba41c6a8e fixed npe. fixed #717 2014-11-27 10:30:06 +01:00
iNPUTmice
2f02d8d398 create conversation with bare jid 2014-11-27 10:26:53 +01:00
iNPUTmice
0b8032dbd6 use getAttributeAsJid method 2014-11-27 10:26:34 +01:00
kriztan
e1e28e9ef6 Update german translations 
modified translations a bit
 2014-11-26 11:39:40 +01:00
Daniel Gultsch
7a75a8bc5a Merge pull request #713 from betheg/muc 
MUC: do not add yourself to the muc user list.
 2014-11-24 11:53:28 +01:00
Daniel Gultsch
6f21dc84d5 Merge pull request #714 from betheg/muc_bookmark_cd 
MUC: option to set/delete bookmark in conference details.
 2014-11-24 09:31:29 +01:00
Michael
31b539daf7 MUC: option to set/delete bookmark in conference details. 2014-11-23 21:37:45 +01:00
kriztan
4d841587c8 Update german translations 2014-11-23 15:21:12 +01:00
Michael
dbe8280662 add an listener for the muc roster update. 
this is for the ConferenceDetailsActivity to show
precence updates immediately.
 2014-11-23 15:19:44 +01:00
Michael
bdfdc5fb10 MUC: do not add yourself to the muc user list. 2014-11-23 15:19:07 +01:00
kruks23
ca761bac3c Update spanish translations 2014-11-22 00:37:41 +01:00
iNPUTmice
28fefad834 work around to not confuse irc transport with real conference servers 2014-11-21 20:34:19 +01:00
Daniel Gultsch
36f8a31d7d Merge pull request #706 from betheg/unused_imports 
remove unused imports.
 2014-11-21 20:03:46 +01:00
iNPUTmice
81a1a48b8d update action bar with conversations updates as well 2014-11-21 20:02:13 +01:00
Michael
febbefefa5 MUC: set from when join muc. 2014-11-21 19:37:50 +01:00
Michael
dc0dba3faf remove unused imports. 2014-11-21 19:17:27 +01:00
iNPUTmice
424de3ea3a move task to back and not finish when hitting back button 2014-11-21 18:57:27 +01:00
Michael
44faec7051 STATUS_CODE_SELF_PRESENCE is not set in all case. 2014-11-21 16:14:56 +01:00
iNPUTmice
888475d4fe additional null pointer saftey checks 2014-11-21 15:25:57 +01:00
iNPUTmice
de0b36fc78 verify contacts key only on initiating side of smp 2014-11-21 13:42:25 +01:00
iNPUTmice
92ad4cb736 changed listener timing and cache clearing after muc presences 2014-11-20 22:44:31 +01:00
iNPUTmice
66abdfccd4 create file and dirs before creating file 2014-11-20 22:02:32 +01:00
Daniel Gultsch
8fe3b2974b Merge pull request #698 from kriztan/patch-1 
Update german translations
 2014-11-20 21:47:12 +01:00
Michael
3e3767cb06 change status codes string 'number' to a better readable constant. 2014-11-20 21:37:56 +01:00
kriztan
13bb46d550 Update german translations 2014-11-20 19:20:49 +01:00
iNPUTmice
a207240881 fixed potential NPEs 2014-11-20 18:42:47 +01:00
iNPUTmice
a142dcc263 import fixes 2014-11-20 18:33:04 +01:00
iNPUTmice
8b10ea676c Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-20 18:20:45 +01:00
iNPUTmice
0ad6d0616f brought ad hoc conferences back. fixed #688 fixed #367 2014-11-20 18:20:42 +01:00
Sam Whited
73d184352e Remove broken / unused imports 2014-11-19 14:57:23 -05:00
iNPUTmice
e9948f6b84 sent read marker to full jid 2014-11-19 17:40:42 +01:00
iNPUTmice
cbf42ee12c some saftey checks before registering listeners in XmppActivity 2014-11-19 17:31:28 +01:00
Daniel Gultsch
4b9a507633 Merge pull request #691 from kruks23/development 
Update spanish translation
 2014-11-19 17:22:57 +01:00
Daniel Gultsch
393807ab2d Merge pull request #692 from kriztan/patch-3 
Update german translations
 2014-11-19 17:22:50 +01:00
Aitor Beriain
24b5d0eb26 Update basque translation 2014-11-19 16:12:31 +01:00
kriztan
6847594363 Update german translations 2014-11-19 08:51:23 +01:00
kruks23
3ccee22c86 Update spanish translations 2014-11-19 00:16:45 +01:00
kruks23
8f33f3540a Update spanish translations 2014-11-18 23:53:37 +01:00
iNPUTmice
66087cb360 put error notification into notification service 2014-11-18 15:26:28 +01:00
iNPUTmice
1122e084a0 simplified message merge condition 2014-11-18 14:49:49 +01:00
iNPUTmice
10bf2b77a8 synchronized message list in conversation fragment 2014-11-18 14:43:15 +01:00
iNPUTmice
dcebc120ac show dynamic tags in contacts activity as well 2014-11-18 14:24:06 +01:00
iNPUTmice
ab832bcff7 properly remove conversations context menu 2014-11-18 13:51:04 +01:00
iNPUTmice
d29c861d03 disabled broken conversations context menu 2014-11-18 03:12:51 +01:00
iNPUTmice
018a0c7978 better usage of synchronized in some places 2014-11-18 03:10:59 +01:00
iNPUTmice
090e6ecf09 better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary 2014-11-18 01:48:16 +01:00
iNPUTmice
d2a4855a1e added rendered versions of new icons 2014-11-18 00:42:19 +01:00
iNPUTmice
240d2d68c8 context menu for conversations. fixed #630 2014-11-18 00:07:27 +01:00
iNPUTmice
86241a260a clear avatar cache with new roster push from server 2014-11-17 21:28:16 +01:00
iNPUTmice
abbadcb58b avoided some null pointers 2014-11-17 20:45:00 +01:00