Commit Graph

197 Commits

Author SHA1 Message Date
Daniel Gultsch
f8aa1bfec4 kick after ban 2015-01-08 01:23:53 +01:00
Daniel Gultsch
8d655f445a more muc options
* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this
2015-01-07 18:34:24 +01:00
Daniel Gultsch
ef525fb10e basic affiliation changes in muc 2015-01-07 15:03:29 +01:00
Daniel Gultsch
81e9afdf19 reset next encryption when archiving conversations 2015-01-07 12:20:39 +01:00
Daniel Gultsch
a22c8c04d8 use copyonwritearraylist in for phone helper 2015-01-07 01:01:15 +01:00
Daniel Gultsch
f02f510c18 fixed bug in new ping strategy 2015-01-06 19:46:52 +01:00
Daniel Gultsch
0c51245ff5 reworked ping scheduling strategy. very experimental 2015-01-05 18:45:39 +01:00
Olivier Mehani
f1ebece866 Send notification to Pebble on new message
This implements basic notifications to the Pebble through the app (using
an intent).  This simply hooks into NotificationService.notify().

This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2015-01-05 23:06:46 +11:00
Daniel Gultsch
3522243835 do not run mam queries in findOrCreateConversation() when isn't available 2015-01-04 18:16:55 +01:00
Sam Whited
88704ce5cd Verify IQ responses
Fixes #20

Move fromServer/toServer to AbstractStanza
2015-01-04 08:28:13 -05:00
Sam Whited
eb7e683403 Make IqPacket type an enum 2015-01-04 08:20:30 -05:00
Daniel Gultsch
e32a927300 Use packet callbacks only for IqPackets. Removed unnecessary code 2015-01-04 12:09:39 +01:00
Daniel Gultsch
fc8bd64bfd void messages getting reloaded through mam after clear history 2015-01-03 18:22:26 +01:00
Daniel Gultsch
8bda54d48c code cleanup 2015-01-03 00:47:22 +01:00
Daniel Gultsch
bcd3be59ce put Conversations into background mode earlier 2015-01-02 12:04:33 +01:00
Daniel Gultsch
0c22a8d1c6 added callback to change account password to notify UI on success / failure 2014-12-25 22:08:13 +01:00
Sam Whited
e4d9dca2fe Add ability to change password on server
Fixes #260
2014-12-25 21:38:55 +01:00
Sam Whited
e152ed1e07 Simplify roster handling code
Merge result handling code into IqParser

Fixes #20
2014-12-22 12:53:31 -05:00
Sam Whited
af7a64491f Add support for XEP-0191 (Blocking command)
Fixes #791

Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
2014-12-22 08:19:00 -05:00
iNPUTmice
1517641713 get rid of special self presence object and incorporate that into roster 2014-12-20 17:23:03 +01:00
iNPUTmice
6b047bed97 fixed another break continue bug 2014-12-20 12:52:45 +01:00
iNPUTmice
88f43643bf inject ui callback into running mam query 2014-12-20 12:52:08 +01:00
iNPUTmice
c30108eb17 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-12-17 10:51:28 +01:00
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
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
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
183e31ade1 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:35:29 +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
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
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
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
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
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
46e319b241 more safety checks for listener counts 2014-12-03 14:55:09 +01:00
iNPUTmice
eb0f8c08bd safety net in joinMuc 2014-12-03 00:06:57 +01:00
iNPUTmice
241de062da cleaned up avatar / tile creation 2014-12-03 00:06:57 +01:00
iNPUTmice
d98486d1ca fixed npe for broken bookmarks 2014-11-29 19:09:28 +01:00
iNPUTmice
1ff9293ee1 fix for concurrency issue 2014-11-29 13:09:56 +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
febbefefa5 MUC: set from when join muc. 2014-11-21 19:37:50 +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
66087cb360 put error notification into notification service 2014-11-18 15:26:28 +01:00
iNPUTmice
018a0c7978 better usage of synchronized in some places 2014-11-18 03:10:59 +01:00
iNPUTmice
f41c3eee04 context menu for muc participants + refactor trueCounterpart to use Jid class 2014-11-17 20:02:46 +01:00
iNPUTmice
283d5058e5 synchronized around cache clear in avatar service 2014-11-17 20:01:56 +01:00
Daniel Gultsch
155b607f4d Merge pull request #673 from SamWhited/development
Fix fetching accounts by JIDs
2014-11-16 17:35:59 +01:00
iNPUTmice
cf00f3fade happy hanukkah 2014-11-16 17:21:21 +01:00
Sam Whited
5765a91db6 Fix fetching accounts by JIDs
Fixes a crash when publishing an avatar
2014-11-16 10:04:45 -05:00
iNPUTmice
88c3537b68 parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible 2014-11-16 00:20:20 +01:00
Sam Whited
d94b07c916 Make account status an enum 2014-11-15 11:12:41 -05:00
iNPUTmice
35bf13f5ef Merge branch 'feature/file_transfer' into development
Conflicts:
	src/main/res/values/strings.xml
2014-11-15 15:52:15 +01:00
iNPUTmice
bdc86bb8e3 added low priority and removed date in foreground noticfication 2014-11-15 15:34:34 +01:00
iNPUTmice
3c6b3506e3 turn on foreground service in expert settings 2014-11-15 15:34:34 +01:00
iNPUTmice
47d44448f3 fixed description in notifications and conversation overview 2014-11-15 15:34:12 +01:00
iNPUTmice
e0f012dba1 fixed resending for files as well 2014-11-15 15:34:12 +01:00
iNPUTmice
cc4f3702a8 made file transfers cancelable 2014-11-15 15:34:12 +01:00
iNPUTmice
16847a30c8 support for pgp files 2014-11-15 15:34:12 +01:00
iNPUTmice
dac12be53e copy non local files to private storage first 2014-11-15 15:34:11 +01:00
iNPUTmice
02cbda68a7 bug fixes and various improvements for file transfer 2014-11-15 15:34:11 +01:00
iNPUTmice
7a90ca429b basic arbitrary file transfer 2014-11-15 15:34:11 +01:00
iNPUTmice
fce78abb1c temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds 2014-11-11 00:16:43 +01:00
iNPUTmice
89ee999e1b more refactoring for presence selection. removed getTo, getFrom and getJid from Element 2014-11-10 01:24:35 +01:00
iNPUTmice
69ef17efc0 migrated some otr stuff to new jid classes 2014-11-09 17:46:00 +01:00
iNPUTmice
c310ada8b3 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-11-09 17:05:20 +01:00
iNPUTmice
e9af0d4ca7 Merge branch 'master' into development 2014-11-09 17:02:49 +01:00
iNPUTmice
61f046a675 make avatar service not break on empty names 2014-11-09 17:02:39 +01:00
Sam Whited
180a0e4408 Rework `Account.getJid()' to return full JIDs
Remove `Account.getFullJid()'
2014-11-09 10:57:22 -05:00
iNPUTmice
377bd49ee8 refactored code to always contain full jid for counterpart 2014-11-09 16:21:13 +01:00
Sam Whited
1a3327f2b1 Create avatar's for JID's w/o localparts 2014-11-09 07:00:40 -05:00
Sam Whited
5ce0cd3802 Fields that we sync on should be final 2014-11-09 07:00:40 -05:00
Sam Whited
9db624ec7b It builds again! 2014-11-09 07:00:40 -05:00
Sam Whited
f108fc5a5c Update more files to use JID objects 2014-11-09 07:00:40 -05:00
Sam Whited
9053f4aca0 Move a chunk of classes over to using JID objects 2014-11-09 07:00:40 -05:00
iNPUTmice
2253814519 fixed notifications for images 2014-11-05 21:37:40 +01:00
iNPUTmice
6a43bda4d7 fixed #617 2014-11-05 00:06:07 +01:00
iNPUTmice
1ea2e7dc3b fixed arrayoutofbounds + spelling 2014-11-01 14:33:34 +01:00
Sam Whited
46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
Sam Whited
281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00