Commit Graph

637 Commits

Author SHA1 Message Date
iNPUTmice
91e85d2faf adapt caps on whether or not message confirmation is on 2015-01-26 00:48:56 +01:00
iNPUTmice
94086bb9b7 don't put ejabberds status code muc messages into an actual conversation 2015-01-26 00:26:16 +01:00
iNPUTmice
f0d428a56d made connect time out more failsave 2015-01-25 20:52:53 +01:00
Daniel Gultsch
4afdd6480a Merge pull request #930 from betheg/otr
otr: switch to the otr-state the partner alternate.
2015-01-25 20:53:29 +01:00
Daniel Gultsch
1559144701 Merge pull request #933 from betheg/mergeable
fix mergable() for /me command.
2015-01-25 19:30:00 +01:00
Michael
29331e49b9 fix mergable() for /me command. 2015-01-25 16:58:06 +01:00
iNPUTmice
14fc520ec0 updated translations 2015-01-25 16:36:57 +01:00
iNPUTmice
82a74fabc9 set jingle file transfer to offer after iq offer has returned 2015-01-25 16:32:59 +01:00
Jaroslav Lichtblau
0f3fb3ab43 Czech translation
for "hide offline" added
2015-01-25 16:18:09 +01:00
Michael
7800647885 otr: switch to the otr-state the partner alternate.
should also fixed #877
2015-01-25 13:07:31 +01:00
Michael
8041d23cb1 MessageParser: fix the regex for otr query messages. 2015-01-24 16:19:58 +01:00
Daniel Gultsch
7769d305e6 Merge pull request #924 from andersruneson/changeonlinecolor
Changed online color to green instead of primary
2015-01-24 00:28:29 +01:00
iNPUTmice
b9af38464e fixed mam to work with muc 2015-01-24 00:22:51 +01:00
Anders Sandblad
cbebd14dbd Changed online color to green instead of primary 2015-01-23 22:28:10 +01:00
iNPUTmice
4e50098e31 show checkbox to hide offline contacts 2015-01-21 17:24:02 +01:00
iNPUTmice
2dc69eea68 fixed bug in find conference in database method 2015-01-21 16:18:57 +01:00
iNPUTmice
00c74503ab deal with user entering full jids in join conference dialog 2015-01-21 16:18:38 +01:00
iNPUTmice
be9af442ef always allow access to contact details. provide add button in contact details 2015-01-21 15:31:40 +01:00
Sam Whited
764ef3c8cd Add block/unblock to contact details menu
See #889
2015-01-21 13:07:36 +01:00
Daniel Gultsch
818c0e609c Merge pull request #908 from betheg/otr4j
otr4j: update to 0.22
2015-01-21 11:48:42 +01:00
Sam Whited
e42e0f88e1 Add color / category to foreground notification 2015-01-20 20:32:27 -05:00
iNPUTmice
7839438f51 changed message duplicate finder 2015-01-20 22:54:58 +01:00
iNPUTmice
6dc53c2b35 fixed missing image preview 2015-01-20 22:54:26 +01:00
iNPUTmice
04f4680582 fixed up button on v21 devices 2015-01-20 22:53:45 +01:00
Michael
fa7d748c3f otr4j: update to 0.22 2015-01-20 18:01:39 +01:00
iNPUTmice
32a16137df Fixed action bar search for Android 5.0 2015-01-20 14:53:47 +01:00
Jaroslav Lichtblau
7e4053abff Czech translation updated
for Conversations
2015-01-19 19:07:43 +01:00
Sam Whited
503237087f Remove legacy SSL support 2015-01-19 11:02:13 -05:00
iNPUTmice
1e607d7b1b don't trim bodies 2015-01-19 12:15:27 +01:00
iNPUTmice
c5d087ad55 fetched translations from transifex 2015-01-19 12:14:55 +01:00
iNPUTmice
4cbf8120f5 fixed legacy translation of image received 2015-01-19 12:14:30 +01:00
iNPUTmice
e5dffcfb07 added changelog for 1.0 2015-01-19 11:32:27 +01:00
iNPUTmice
100ba6e7e7 check for deleted files when loading more messages from history 2015-01-19 11:23:05 +01:00
iNPUTmice
7af588c8b3 account for rounding errors when rescheduling wake up 2015-01-19 11:17:27 +01:00
iNPUTmice
fc2e458053 fixed bug when sharing files from google drive 2015-01-18 20:27:16 +01:00
iNPUTmice
149a6716b8 proper desc for offering and sending images in conversations overview 2015-01-18 20:26:22 +01:00
iNPUTmice
6756386eee explain read marker 2015-01-18 13:44:18 +01:00
iNPUTmice
d58fadd05f use same helper methods for images and files 2015-01-18 13:00:57 +01:00
Daniel Gultsch
d453e5501b Merge pull request #899 from SamWhited/api21_notifications
Add some Android 21 notification features
2015-01-18 11:58:11 +01:00
Daniel Gultsch
78ac43cfa2 Merge pull request #901 from kriztan/patch-2
Added new file type names for file transfers
2015-01-18 11:57:34 +01:00
Christian S
ae16439bd6 Added new file type names for file transfers
- apk
- vcard
2015-01-18 11:17:27 +01:00
Sam Whited
99989cd1d5 Add some Android 21 notification features 2015-01-17 23:41:57 -05:00
Sam Whited
83c806a774 Fix string substitutions with unknown filetypes 2015-01-17 20:53:25 -05:00
Sam Whited
dfc1cea882 Correct the download file string on notifications
Fixes #896
2015-01-17 09:11:04 -05:00
Sam Whited
edd58f19b4 Add download button on notification if applicable 2015-01-16 01:10:01 -05:00
iNPUTmice
dc8b467cf6 sending read marker when resuming activity and conversation is open 2015-01-15 16:32:24 +01:00
iNPUTmice
c0993a9acb show toast when avatar has been published - fixed #874 2015-01-15 16:26:46 +01:00
iNPUTmice
994c9495ba added dedicated button to disable foreground service in perma notification 2015-01-15 16:17:55 +01:00
iNPUTmice
351e5d7065 fixed #888 2015-01-15 15:45:11 +01:00
Daniel Gultsch
a3f9f30a6c Merge pull request #885 from SamWhited/display-enter-key
Add option to swap enter/emoticon key
2015-01-14 22:54:02 +01:00
iNPUTmice
a6a9ed4877 handle muc nicks with white spaces. fixed #884 2015-01-14 22:48:14 +01:00
Sam Whited
0a96bec3c1 Add option to swap enter/emoticon key 2015-01-14 16:14:14 -05:00
Sam Whited
548a585b2c Harden the TLS connection cipher suites 2015-01-14 13:10:15 -05:00
Daniel Gultsch
a88824bb1d Merge pull request #882 from SamWhited/apiandjavafixes
Type safety and deprecated API forward-compatibility fixes for Notifications
2015-01-14 10:47:37 +01:00
Sam Whited
caf861d96f Ensure type safety in Pebble notifications
Also use forward-compatible screen-on detection
2015-01-13 23:18:35 -05:00
Sam Whited
acb3aed99c Fix bottom padding on about page 2015-01-13 21:29:47 -05:00
Daniel Gultsch
7d2a9624b5 make use of different dimensions for different screen sizes 2015-01-13 11:52:41 +01:00
Daniel Gultsch
1262a7cba7 Merge pull request #872 from Elinvention/development
Updated Italian translations
2015-01-13 10:48:02 +01:00
Daniel Gultsch
1fac4754d8 Merge pull request #873 from SamWhited/about-margin-fix
Use margin instead of padding on about screen
2015-01-13 10:12:33 +01:00
Sam Whited
d9c2fa39cd Use margin instead of padding in about screen 2015-01-12 23:08:26 -05:00
Elia
8f6ee1fe22 Updated Italian translations 2015-01-13 01:32:51 +01:00
Jaroslav Lichtblau
c920a09a0c Czech translation
updated
2015-01-12 20:07:26 +01:00
Daniel Gultsch
dd5101ff5c catch bug in guessContentType 2015-01-12 18:40:15 +01:00
Daniel Gultsch
8d3323e384 context menu for files and offered files. fixed #848 fixed #849 2015-01-12 16:42:20 +01:00
Daniel Gultsch
77e4e1c2ac reworked message preview / message meta information (ie file offered, received * file)
fixed #837
2015-01-12 16:09:39 +01:00
Daniel Gultsch
50c8065015 Merge pull request #866 from SamWhited/xep0245
Add XEP-0245 (/me command) support
2015-01-12 01:22:40 +01:00
Sam Whited
3c5224251c Add XEP-0245 (/me command) support 2015-01-11 18:32:00 -05:00
Daniel Gultsch
ef6e4c5dd5 do not check image file size over http if accepted file size is 0 2015-01-11 22:18:18 +01:00
Daniel Gultsch
b07b7519a6 keep proper image file extension 2015-01-11 15:19:36 +01:00
Daniel Gultsch
0aa50cb5a1 shortened some string 2015-01-11 01:01:33 +01:00
Daniel Gultsch
e34bc920e4 fixed #860 2015-01-10 23:56:56 +01:00
Daniel Gultsch
18eb187949 make room persistant when changing subject or other muc options 2015-01-10 23:10:32 +01:00
Daniel Gultsch
158f5dd17c don't crash when selecting a conversation by uuid did not work 2015-01-10 19:43:23 +01:00
Daniel Gultsch
c89fdec0b1 fixed regression in tablet ui 2015-01-09 22:24:50 +01:00
Daniel Gultsch
06eae476ee Introduced expert options to control enter-is-send
(default == off)
2015-01-09 19:23:26 +01:00
Daniel Gultsch
0a48f777ac code cleanup for jingle proxy discovery 2015-01-09 14:42:58 +01:00
Daniel Gultsch
d9f88c4669 ensure that everyone is member before making a room private 2015-01-09 13:28:01 +01:00
Daniel Gultsch
734a9934a3 make project translatable via transifex 2015-01-09 02:06:03 +01:00
Daniel Gultsch
ffa97c48f5 added missing drawables 2015-01-08 23:02:31 +01:00
Daniel Gultsch
a9159568b9 allow for very basic muc configuration 2015-01-08 21:29:26 +01:00
Daniel Gultsch
0fe193b027 code cleanup 2015-01-08 14:45:44 +01:00
Daniel Gultsch
f8aa1bfec4 kick after ban 2015-01-08 01:23:53 +01:00
Daniel Gultsch
f8dc59be81 fixed german translation 2015-01-08 00:41:37 +01:00
Daniel Gultsch
061de5205e some clean ups for affiliation change context menu 2015-01-08 00:23:26 +01:00
Daniel Gultsch
cff9a937f2 Merge pull request #851 from kriztan/patch-2
Updated German translations for more muc options
2015-01-07 23:53:36 +01:00
Daniel Gultsch
20aa7bea47 Merge pull request #852 from SamWhited/ellipsis
s/.../…/ in CS strings
2015-01-07 23:53:26 +01:00
Daniel Gultsch
8505102cee Merge pull request #850 from plsng/dutch
Update Dutch translations
2015-01-07 23:53:08 +01:00
Sam Whited
e1ea20b392 s/.../…/ in CS strings
[ci skip]
2015-01-07 13:42:49 -05:00
Christian S.
45c1e88a08 Updated German translations for more muc options 2015-01-07 19:06:18 +01:00
Nathan Follens
c9dc82d134 Update Dutch translations 2015-01-07 18:49:13 +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
d70b5f93f3 Merge branch 'development' of https://github.com/siacs/Conversations into development 2015-01-07 18:32:51 +01:00
Daniel Gultsch
8ab19faddd Merge pull request #847 from kriztan/patch-1
Updated German translations...
2015-01-07 18:30:16 +01:00
Christian S
9d43ddbf59 Updated German translations...
...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation?

I've changed the translations.

Updated German translations...

Updated German translations...
2015-01-07 18:08:18 +01:00
Daniel Gultsch
0ad8796b44 fixed invites 2015-01-07 16:45:44 +01:00
Daniel Gultsch
af1410b02a Merge pull request #845 from SamWhited/material
Add materials theme for v21 devices
2015-01-07 15:57:27 +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
943a01b9bf Merge branch 'development' of https://github.com/siacs/Conversations into development 2015-01-07 10:49:40 +01:00
Daniel Gultsch
a7ee9cc41b Merge pull request #846 from kruks23/translation4
Update spanish translation
2015-01-07 10:28:37 +01:00
kruks23
a1a2a39108 Update affiliation in MUC details and advance mode 2015-01-07 08:50:19 +01:00
Sam Whited
45bb59dba8 Add materials theme 2015-01-06 21:37:49 -05:00
Daniel Gultsch
a22c8c04d8 use copyonwritearraylist in for phone helper 2015-01-07 01:01:15 +01:00
Daniel Gultsch
d502e57661 refactored UiHelper 2015-01-07 00:59:42 +01:00
Jaroslav Lichtblau
066f60a23c Czech translation for - show affiliation instead of role in MucDetails 2015-01-06 21:15:32 +01:00
Daniel Gultsch
f02f510c18 fixed bug in new ping strategy 2015-01-06 19:46:52 +01:00
Daniel Gultsch
353f4e38bb mark sent images as sent_received instead of sent
fixed #842
2015-01-06 18:44:34 +01:00
Daniel Gultsch
8a3ccfd456 Merge pull request #841 from BenoitBouvarel/patch-2
Update strings.xml
2015-01-06 18:33:56 +01:00
Daniel Gultsch
562699c745 run invalidateOptionsMenu on uiThread 2015-01-06 18:26:14 +01:00
Daniel Gultsch
4b0043ba91 fixed potential NPEs in ShareWithActivity 2015-01-06 18:25:31 +01:00
Benoit Bouvarel
352af145f8 Update strings.xml
char ">" was missing at line 285
2015-01-06 01:23:51 +01:00
Benoit Bouvarel
f8758b7bd5 Update strings.xml
French translation updated
2015-01-05 23:42:37 +01:00
Daniel Gultsch
777e060100 Merge branch 'development' of https://github.com/siacs/Conversations into development 2015-01-05 18:47:04 +01:00
Daniel Gultsch
fdcbdfdc05 added debug info + possible platform bug work arounds to message adapter 2015-01-05 18:46:42 +01:00
Daniel Gultsch
0c51245ff5 reworked ping scheduling strategy. very experimental 2015-01-05 18:45:39 +01:00
Daniel Gultsch
85f24c9106 avoid requesting blocklist after stream resumption 2015-01-05 16:17:05 +01:00
Christian Schneppe
47a8a39595 corrected German spellings
and shorten some strings
2015-01-05 15:59:21 +01:00
Daniel Gultsch
2679824770 prevent QR code parser from crashing fixed #839 2015-01-05 15:08:13 +01:00
Daniel Gultsch
bdb335e6b0 Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role 2015-01-05 15:06:39 +01:00
Daniel Gultsch
8264474a0c Merge pull request #838 from shtrom/pebble-notifications-squash
Send notification to Pebble on new message
2015-01-05 13:14:48 +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
Christian Schneppe
ddee804a01 Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB 2015-01-05 12:46:13 +01:00
Daniel Gultsch
2723c9ccb9 made checks for valid image extensions case insensitive 2015-01-04 23:04:23 +01:00
Daniel Gultsch
3522243835 do not run mam queries in findOrCreateConversation() when isn't available 2015-01-04 18:16:55 +01:00
Daniel Gultsch
e6cd92a663 added higher auto accept file sizes
also changed labeling to MiB and KiB
2015-01-04 17:53:06 +01:00
Daniel Gultsch
0d6d09b7e9 code cleanup + logging of spoofed iq packets 2015-01-04 15:40:09 +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
00fdac42a9 Merge pull request #832 from svetlemodry/development
Czech translation update
2015-01-04 12:45:48 +01:00
Jaroslav Lichtblau
3a4fbcd4cc Czech translation update 2015-01-04 12:43:32 +01:00
Daniel Gultsch
5c190487bc deal with prosodys muc namespace tagging of messages 2015-01-04 12:37:22 +01:00
Daniel Gultsch
e32a927300 Use packet callbacks only for IqPackets. Removed unnecessary code 2015-01-04 12:09:39 +01:00
Daniel Gultsch
51f5b84ee4 Merge pull request #829 from kriztan/patch-1
corrected German 'private_message_to'
2015-01-04 11:28:38 +01:00
sergio
c674e9c3e9 Update spanish translations 2015-01-04 11:24:53 +01:00
kriztan
b739a0d200 corrected German 'private_message_to' 2015-01-04 11:16:21 +01:00
Daniel Gultsch
f338d89753 no longer use ConcurrentHashMap in favor of synchronize on a final HashMap 2015-01-04 00:14:40 +01:00
Daniel Gultsch
4f4eff2353 Merge branch 'development' 2015-01-03 22:39:50 +01:00
kriztan
58b7e71e58 Added and modified German translations 2015-01-03 19:35:58 +01:00
Daniel Gultsch
e89e54a04a version bump to 0.10 2015-01-03 19:11:27 +01:00
Daniel Gultsch
fc8bd64bfd void messages getting reloaded through mam after clear history 2015-01-03 18:22:26 +01:00
Daniel Gultsch
be7de054be record voice and attachment refactor 2015-01-03 16:06:59 +01:00
Daniel Gultsch
960b7343d3 disable / enable all accounts 2015-01-03 13:36:48 +01:00
Daniel Gultsch
521c289db1 update last presence only for messages 2015-01-03 13:01:38 +01:00
Daniel Gultsch
715c8545f4 added missing layout file 2015-01-03 10:35:12 +01:00
Daniel Gultsch
8bda54d48c code cleanup 2015-01-03 00:47:22 +01:00
Daniel Gultsch
969044b113 migrated change password into separate activity 2015-01-03 00:11:02 +01:00
Daniel Gultsch
1988e244ef some further otr improvements 2015-01-02 15:14:06 +01:00
Daniel Gultsch
f58f27a1f7 click on dynamic tag to filter for that tag 2015-01-02 14:47:08 +01:00
Daniel Gultsch
093c5275c6 Merge remote-tracking branch 'origin/development' into development 2015-01-02 14:28:02 +01:00
Daniel Gultsch
3df23a4f75 allow cancellation of waiting files 2015-01-02 14:27:49 +01:00