moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-14 21:15:08 -05:00
Code Issues Releases Wiki Activity
1,916 Commits 5 Branches 73 Tags 39 MiB
2723c9ccb9
Commit Graph

313 Commits

Author SHA1 Message Date
iNPUTmice
741a0c129d made scroling smoother + bug fixes for history loading 2014-12-17 10:50:51 +01:00
iNPUTmice
80435eca5c smoothed out scrolling a bit 2014-12-17 09:32:51 +01:00
Daniel Gultsch
5603440a91 Merge pull request #783 from SamWhited/quiet-hours 
Update summary in TimePreference change listener
 2014-12-17 07:15:31 +01:00
iNPUTmice
1a7ed4ed7c properly detect images in share with 2014-12-17 07:12:38 +01:00
iNPUTmice
fd4cf499a2 Merge branch 'issue756' of https://github.com/SamWhited/Conversations into SamWhited-issue756 2014-12-17 07:00:42 +01:00
iNPUTmice
3f6638cb64 properly count mam messages 2014-12-17 06:59:58 +01:00
Sam Whited
0b4987581f Handle time comparisons using longs 2014-12-16 18:03:16 -05:00
Sam Whited
6659339eff Allow sending of any filetype via intent 
Fixes #756
 2014-12-15 22:31:55 -05:00
Sam Whited
f9c783085d Update summary in TimePreference change listener 
Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener.
 2014-12-15 17:46:32 -05:00
iNPUTmice
e2f50ab855 go through mam history page by page. load mam dynamically on scroll 2014-12-15 23:06:29 +01:00
Daniel Gultsch
03ca971e2e Merge pull request #782 from SamWhited/quiet-hours 
Make some magic number constants final
 2014-12-15 19:28:21 +01:00
Sam Whited
ea61142d7e Make some magic number constants final 2014-12-15 11:39:18 -05:00
iNPUTmice
ab2187dbdf fixed crashing on unparsed jids 2014-12-15 17:36:16 +01:00
iNPUTmice
183e31ade1 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:35:29 +01:00
iNPUTmice
e084266595 migrated more jid parsing to use getAttributeAsJid. added error logging 2014-12-15 17:29:17 +01:00
Sam Whited
af0f8e87bb Make silent notification when quiet hours are on 
Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh!
 2014-12-15 11:23:50 -05:00
iNPUTmice
25d8546ae8 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:16:49 +01:00
iNPUTmice
2bd4621245 fixed history deletion. fixed #780 2014-12-15 17:14:27 +01:00
iNPUTmice
209e62d68b avoid npe on weird platform bugs 2014-12-15 16:55:38 +01:00
iNPUTmice
f8a496a5f1 run mam queries only when online 2014-12-14 23:23:56 +01:00
Sam Whited
a6d4b0aec5 Add quiet hours feature 2014-12-14 15:07:41 -05:00
iNPUTmice
5cbae25808 more patches for dns helper 2014-12-14 19:02:29 +01:00
iNPUTmice
50410dad33 possible dns fixes 2014-12-14 18:31:52 +01:00
iNPUTmice
de06cb38d1 refactored the way certain messages are being found within a conversation 2014-12-14 18:10:46 +01:00
iNPUTmice
fc293aaede avoiding concurrent modification 2014-12-13 22:17:27 +01:00
iNPUTmice
6148f04d7b fixed regression 2014-12-13 20:05:46 +01:00
iNPUTmice
899802646c reverse through mam history when loading larger chuncks 2014-12-13 15:32:11 +01:00
iNPUTmice
02a89f4ce2 Merge branch 'feature/mam' into development 
Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
 2014-12-13 13:55:24 +01:00
iNPUTmice
2368ba518d refactored phone contacts merger 2014-12-13 13:52:57 +01:00
iNPUTmice
b523518e4b various mam improvments 2014-12-13 12:25:52 +01:00
iNPUTmice
f2510ae9f6 mark otr messages as no-store for mam 2014-12-10 14:08:06 +01:00
iNPUTmice
1dcdc79a71 changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack) 2014-12-10 14:08:06 +01:00
iNPUTmice
ccdb0fd971 save server id from mam messages. check for dups before adding mam 2014-12-10 14:08:06 +01:00
iNPUTmice
0ab530932a added max history age (default 1w). automatically sort newly added mam messages 2014-12-10 14:08:06 +01:00
iNPUTmice
4a94389f05 very basic mam support 2014-12-10 14:08:06 +01:00
iNPUTmice
34558cc277 store last message received date in conversation 2014-12-10 14:08:06 +01:00
iNPUTmice
2b958e51df removed unnecessary otr error response 2014-12-10 14:07:56 +01:00
iNPUTmice
05d1f46c15 recreate activity after theme has changed. fixed #764 2014-12-09 20:22:21 +01:00
iNPUTmice
78370094e9 cleanup: removed unused emoticon parsing 2014-12-09 14:21:35 +01:00
iNPUTmice
9d52f62767 cleanup: removed stream compression 2014-12-09 14:14:15 +01:00
iNPUTmice
5acd471880 version bump to 0.9.3 2014-12-07 21:42:50 +01:00
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
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
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
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
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
Daniel Gultsch
52a43db6d6 Merge pull request #721 from SamWhited/warning_fixes 
Warning "fixes"
 2014-11-29 19:14:13 +01:00
iNPUTmice
d98486d1ca fixed npe for broken bookmarks 2014-11-29 19:09:28 +01: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
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
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
Michael
31b539daf7 MUC: option to set/delete bookmark in conference details. 2014-11-23 21:37:45 +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
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
Michael
3e3767cb06 change status codes string 'number' to a better readable constant. 2014-11-20 21:37:56 +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