093c5275c6
Merge remote-tracking branch 'origin/development' into development
2015-01-02 14:28:02 +01:00
3df23a4f75
allow cancellation of waiting files
2015-01-02 14:27:49 +01:00
f178f23177
Merge pull request #826 from kriztan/patch-1
...
Added German translations
2015-01-02 12:15:29 +01:00
bcd3be59ce
put Conversations into background mode earlier
2015-01-02 12:04:33 +01:00
eca826caf3
Added German translations
2015-01-02 09:12:17 +01:00
8d2f454479
prefer PLAIN over DIGEST-MD5
...
DIGEST-MD5 seems to be broken for a lot of cases (OpenFire)
switched priority of PLAIN to not cause any security errors
2015-01-02 01:39:19 +01:00
bb3bf25523
fixed layout file
2015-01-02 01:37:19 +01:00
3833e6dfef
improved OTR verification part one
2015-01-02 01:21:14 +01:00
b71740f0d4
Merge remote-tracking branch 'origin/development' into development
2014-12-30 09:36:17 +01:00
8f93f9c314
improved fromServer filter
2014-12-30 09:36:00 +01:00
0882da2568
Make `app_name' string untranslatable
...
Remove untranslatable about message
Escape single quote in NL translation
2014-12-29 19:38:47 -05:00
3c5d7d4f1b
refactor swithOverToTls stuff
2014-12-30 01:17:11 +01:00
fb8737ed9f
fixed npe in block menu item
2014-12-30 01:16:33 +01:00
c78dc5b494
fixed nl strings
2014-12-30 01:15:12 +01:00
04de77261b
fixed #818
2014-12-30 01:13:35 +01:00
5df8e6a5b3
Merge pull request #812 from kriztan/patch-1
...
Update german translations
2014-12-30 00:22:49 +01:00
55b84d0895
Merge pull request #813 from plsng/translation
...
Update Dutch translations
2014-12-30 00:22:33 +01:00
d1d4e361ad
Merge pull request #814 from kruks23/translation1
...
Update spanish translations
2014-12-30 00:22:02 +01:00
800520b27b
Update Dutch translations
2014-12-29 23:08:07 +01:00
b48bddb852
Fix typo in method name
2014-12-29 14:21:20 -05:00
164c41661e
Update spanish translations
2014-12-27 13:04:37 +01:00
4a8342a378
Update Dutch translations
2014-12-27 12:53:15 +01:00
3b3d51b39a
Update german translations
2014-12-27 10:42:15 +01:00
193d2645e6
code cleanup for change password stuff
2014-12-25 22:28:19 +01:00
0c22a8d1c6
added callback to change account password to notify UI on success / failure
2014-12-25 22:08:13 +01:00
e4d9dca2fe
Add ability to change password on server
...
Fixes #260
2014-12-25 21:38:55 +01:00
2081c1bef7
proper call to invalidateViews()
2014-12-25 19:53:56 +01:00
ef1f72ea27
catch another exception in fingerprint generation
2014-12-25 19:53:35 +01:00
94aeca7c8a
Merge pull request #810 from kriztan/patch-2
...
Update german translations
2014-12-25 10:23:03 +01:00
3b127ab743
Update german translations
2014-12-25 09:14:34 +01:00
3ada834839
Show server info option when blocking is unavailable
...
Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available.
2014-12-24 20:54:56 +00:00
afbe727b17
Don't allow user to register domain only jids
2014-12-23 17:35:36 -05:00
8a467e33dd
Don't show menu on create account screen
2014-12-23 17:12:52 -05:00
d454788011
Remove old JID validator
2014-12-23 13:23:13 -05:00
01107e31ae
Add more server compatibility info.
...
Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info'
2014-12-23 12:44:30 -05:00
d5f99560ff
made method private that is no longer required to be public
2014-12-23 18:09:29 +01:00
e152ed1e07
Simplify roster handling code
...
Merge result handling code into IqParser
Fixes #20
2014-12-22 12:53:31 -05:00
e1cb72b9ef
Fix NPEs in blocking code
2014-12-22 11:24:08 -05:00
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
1517641713
get rid of special self presence object and incorporate that into roster
2014-12-20 17:23:03 +01:00
ce4848f742
more null checks for otr fingerprints
2014-12-20 16:01:28 +01:00
40335785aa
don't include empty fingerprints in list of otrfingerprints
2014-12-20 15:21:03 +01:00
6b047bed97
fixed another break continue bug
2014-12-20 12:52:45 +01:00
88f43643bf
inject ui callback into running mam query
2014-12-20 12:52:08 +01:00
675bac7255
Merge pull request #794 from svetlemodry/development
...
Czech image transfer string fix
2014-12-20 12:14:11 +01:00
6dd75cbb07
Update spanish translations
2014-12-20 10:54:23 +01:00
c8cfd1b084
Czech image transfer string fix
2014-12-19 22:50:43 +01:00
a68cb5d364
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-12-19 13:40:35 +01:00
627982df90
fixed #755
2014-12-19 13:40:16 +01:00
7c4a306ae4
Czech translation updated
...
added missing strings
2014-12-18 18:42:50 +01:00
948112c2f3
Update german translations
2014-12-18 12:10:03 +01:00
f00e168752
clean up conversation history after swtiching to a different conversation
2014-12-17 21:05:47 +01:00
de952cc959
show error if jid couldn't be parsed in new contact dialog
2014-12-17 21:04:54 +01:00
c30108eb17
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-12-17 10:51:28 +01:00
741a0c129d
made scroling smoother + bug fixes for history loading
2014-12-17 10:50:51 +01:00
80435eca5c
smoothed out scrolling a bit
2014-12-17 09:32:51 +01:00
5603440a91
Merge pull request #783 from SamWhited/quiet-hours
...
Update summary in TimePreference change listener
2014-12-17 07:15:31 +01:00
1a7ed4ed7c
properly detect images in share with
2014-12-17 07:12:38 +01:00
fd4cf499a2
Merge branch 'issue756' of https://github.com/SamWhited/Conversations into SamWhited-issue756
2014-12-17 07:00:42 +01:00
3f6638cb64
properly count mam messages
2014-12-17 06:59:58 +01:00
0b4987581f
Handle time comparisons using longs
2014-12-16 18:03:16 -05:00
6659339eff
Allow sending of any filetype via intent
...
Fixes #756
2014-12-15 22:31:55 -05:00
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
e2f50ab855
go through mam history page by page. load mam dynamically on scroll
2014-12-15 23:06:29 +01:00
03ca971e2e
Merge pull request #782 from SamWhited/quiet-hours
...
Make some magic number constants final
2014-12-15 19:28:21 +01:00
ea61142d7e
Make some magic number constants final
2014-12-15 11:39:18 -05:00
ab2187dbdf
fixed crashing on unparsed jids
2014-12-15 17:36:16 +01:00
183e31ade1
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
2014-12-15 17:35:29 +01:00
e084266595
migrated more jid parsing to use getAttributeAsJid. added error logging
2014-12-15 17:29:17 +01:00
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
25d8546ae8
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
2014-12-15 17:16:49 +01:00
2bd4621245
fixed history deletion. fixed #780
2014-12-15 17:14:27 +01:00
a6cfbf2f2d
Merge pull request #775 from kruks23/translation1
...
Update spanish translations.
2014-12-15 16:57:56 +01:00
16360242d1
Merge pull request #781 from drizzt/patch-1
...
fixed typo in italian translation
2014-12-15 16:57:48 +01:00
209e62d68b
avoid npe on weird platform bugs
2014-12-15 16:55:38 +01:00
9f6537acdc
fixed typo in italian translation
...
s/gallaria/galleria/
2014-12-15 14:19:18 +01:00
f8a496a5f1
run mam queries only when online
2014-12-14 23:23:56 +01:00
a6d4b0aec5
Add quiet hours feature
2014-12-14 15:07:41 -05:00
5cbae25808
more patches for dns helper
2014-12-14 19:02:29 +01:00
50410dad33
possible dns fixes
2014-12-14 18:31:52 +01:00
de06cb38d1
refactored the way certain messages are being found within a conversation
2014-12-14 18:10:46 +01:00
fc293aaede
avoiding concurrent modification
2014-12-13 22:17:27 +01:00
6148f04d7b
fixed regression
2014-12-13 20:05:46 +01:00
899802646c
reverse through mam history when loading larger chuncks
2014-12-13 15:32:11 +01:00
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
2368ba518d
refactored phone contacts merger
2014-12-13 13:52:57 +01:00
1ffdae80a6
Update spanish translations.
2014-12-13 13:24:17 +01:00
b523518e4b
various mam improvments
2014-12-13 12:25:52 +01:00
f2510ae9f6
mark otr messages as no-store for mam
2014-12-10 14:08:06 +01:00
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
ccdb0fd971
save server id from mam messages. check for dups before adding mam
2014-12-10 14:08:06 +01:00
0ab530932a
added max history age (default 1w). automatically sort newly added mam messages
2014-12-10 14:08:06 +01:00
4a94389f05
very basic mam support
2014-12-10 14:08:06 +01:00
34558cc277
store last message received date in conversation
2014-12-10 14:08:06 +01:00
2b958e51df
removed unnecessary otr error response
2014-12-10 14:07:56 +01:00
05d1f46c15
recreate activity after theme has changed. fixed #764
2014-12-09 20:22:21 +01:00
ae3bd9c9e9
Merge pull request #767 from kruks23/translation3
...
Update spanish translations.
2014-12-09 20:16:25 +01:00
920067b8ed
Update spanish translations.
2014-12-09 18:33:13 +01:00
78370094e9
cleanup: removed unused emoticon parsing
2014-12-09 14:21:35 +01:00
9d52f62767
cleanup: removed stream compression
2014-12-09 14:14:15 +01:00
Daniel Gultsch