165965bb83
parse nick and avatar only from available presences to avoid potential error reflection
2015-05-27 11:44:44 +02:00
0f6f6adca0
removed unnecessary / inacurate debug logging
2015-05-26 13:04:22 +02:00
402e5363d1
deduplicate private muc messages
2015-05-26 12:00:55 +02:00
6059ed4738
update unread count badge only when necessary
2015-05-26 12:00:38 +02:00
9debf8037b
added default iq handler to print some iq error messages
2015-05-26 11:31:33 +02:00
997b11dbec
added choose picture as another quick action. fixes #1221
2015-05-26 05:34:58 +02:00
dc91ff8f29
renamed OtrEngine to OtrService
2015-05-26 04:36:32 +02:00
f579602456
Merge branch 'master' into development
2015-05-25 11:15:14 +02:00
36034815ee
use same sm check inside xmppconnection and out
2015-05-25 04:54:11 +02:00
a535d45ec3
log connection age and reshedule ping check
2015-05-25 04:49:36 +02:00
9d1a8c607f
Merge branch 'development' of github.com:siacs/Conversations into development
2015-05-21 09:19:56 +02:00
75977818ea
Merge branch 'master' into development
2015-05-21 09:19:26 +02:00
3cdac228f9
fixed with attaching wrong files when returning to activity and background service is still alive
2015-05-21 05:21:22 +02:00
d908b70340
Merge pull request #1212 from emdete/add_jid_to_show_location
...
fix to detect the sender jid correctly
2015-05-20 18:31:18 +02:00
4759607a77
fix to detect the sender jid correctly
2015-05-20 15:45:08 +02:00
bb065680e5
Merge pull request #1211 from emdete/add_jid_to_show_location
...
add extra jid to intend "show location"
2015-05-20 12:48:03 +02:00
2364710afb
added ShortcutBadger as a dependency to create unread counts on launcher icon
2015-05-20 12:47:04 +02:00
78847d0749
add extra jid to intend "show location"
2015-05-20 11:37:10 +02:00
70ebe35ffe
Merge branch 'master' into development
2015-05-20 08:25:42 +02:00
8064832dca
don't allow user to accidentally send empty messages
2015-05-20 08:25:00 +02:00
201bc158bd
proper error parsing. some clean up
2015-05-20 03:48:14 +02:00
9658146575
fixed npe in new message parser
2015-05-20 03:48:14 +02:00
1b5631c835
fixed muc mam. added a few security checks
2015-05-20 03:48:14 +02:00
eeebebe32a
fixed read/unread markers
2015-05-20 03:48:14 +02:00
b731995a51
added mam stuff to new message parser
2015-05-20 03:48:14 +02:00
d261feda74
rewrote parser code. mam id and possible other stuff still missing. also massivly untested
2015-05-20 03:48:14 +02:00
e32f380dae
provide helper function for getting the content of a child directly
2015-05-20 03:48:14 +02:00
73a4ffefdf
added fall back package id for voice recorder plugin
2015-05-20 03:27:52 +02:00
bb60364488
hide block contact from context menu when server feature is not available fixed #1207
2015-05-19 08:31:56 +02:00
a0575c81ab
use same socket time out for jingle and xmpp connections
2015-05-18 08:48:08 +02:00
1446a59fa5
use a 20s timeout on socks5 connections
2015-05-18 08:46:04 +02:00
fbc43a8d38
don't offer initiator his own candidates
2015-05-18 08:45:50 +02:00
d672d578c9
fixed crash on failed account registry
2015-05-17 12:32:04 +02:00
fce30f22c9
made white space check in bodyContainsDownloadable less aggresive
2015-05-16 12:49:04 +02:00
4151b72a6e
let jingle connection and manager handle message status
2015-05-16 04:12:53 +02:00
b6a7e56bf6
call StartConversationActivity in init mode only after adding the first account
2015-05-15 13:58:11 +02:00
b69ee7125d
Force Nameprepping of JID domain parts
...
The IDN.toAscii()/IDN.toUnicode() family only namepreps the original
domain passed to it if it contained non-ASCII characters. This means
that for all-ASCII domains, no canonicalization is performed, which
leads to issues like case-sensitivity. This workaround explicitly
namepreps domain parts before calling IDN.toAscii() on them, in order to
get a canonicalized representation (most notably, case invariance). A
basic DB migration is also included.
2015-05-14 15:52:55 +02:00
8dfa701043
added a few location questions
2015-05-14 12:08:43 +02:00
8d472157a4
always log reason for failed file transfer
2015-05-14 11:57:51 +02:00
4414cf3b27
ignore question marks in location question
2015-05-13 17:10:11 +02:00
82878cded1
show location quick action after receiving a question about the users location
2015-05-13 16:23:20 +02:00
6489ddac6c
clear avatar cache when uploading new avatar
2015-05-13 14:33:52 +02:00
51aeeb766c
use zero width white space as message seperator
2015-05-13 11:56:59 +02:00
93e620d685
removed debug logging
2015-05-12 04:40:57 +02:00
d3a6aa9f7a
handle conference invites differently to deal with killed activities. fixes #1188
2015-05-12 04:33:04 +02:00
93e444ac3a
don't set unknown error in muc
2015-05-12 03:57:05 +02:00
fe5c4cab46
don't reinit conversation when coming back to activity. avoids unnecessary scrolling
2015-05-12 03:56:13 +02:00
b6f85ba0dd
avoid using paragraph style breaks by accident
2015-05-11 14:18:30 +02:00
9156665add
increased space between merged messages a bit
2015-05-11 09:20:08 +02:00
53e43daa0d
add a little bit of space between merged messages.
2015-05-11 09:08:56 +02:00
21deda7b00
no font padding on red hearts
2015-05-11 08:45:38 +02:00
22b12091a1
rewrote parts of message adapter to avoid using NULL views
2015-05-11 07:57:52 +02:00
239e86a98a
optimized heart render code a bit
2015-05-10 12:04:11 +02:00
33d1621e3b
added white heart to new rendering as well
2015-05-10 11:56:23 +02:00
e6d336c293
Merge branch 'development' of github.com:siacs/Conversations into development
2015-05-10 11:45:01 +02:00
1e28f60038
changed conversation red to material red
2015-05-10 03:14:13 +02:00
4c486f5e58
paint single unicode hearts as red and slightly larger
2015-05-10 03:12:44 +02:00
9e78e3e09d
only forward incoming chat messages to Pebble App and Gadgetbridge
2015-05-08 21:36:20 +02:00
d9e5035c08
config option to reset attempt counts when changing network (default=true)
2015-05-08 06:50:28 +02:00
c4a4dd2392
throw proper exception before changing account into error state
2015-05-08 06:30:06 +02:00
e0653c0371
fixed encrypted ibb file transfer which was broken with ART. fixes #1172
2015-05-07 14:19:51 +02:00
05f0aa614f
fixed npe when binval value of vcard avatar is null
2015-05-07 11:07:15 +02:00
d74e8a8a0e
fixed npe when missing instructions on failed register
2015-05-06 04:33:21 +02:00
db726a59b8
fwiw don't allow stanza count to go over MAX_INT
2015-05-06 04:29:45 +02:00
b7c672e10e
avoid fetching avatars multiple times in parallel
2015-05-05 10:29:41 +02:00
5136bf9832
r/o support for vcard avatars. pep avatars will be prefered
2015-05-05 06:17:34 +02:00
e6aa604ade
enabled sm logging by default at least for development branch
2015-05-05 06:10:47 +02:00
61fd5d6696
clean up in attachment chooser code. fixed #1168
2015-05-04 09:54:10 +02:00
2582ece210
open market if share location plugin isn't installed
2015-05-04 04:38:12 +02:00
d15da64c5d
Fix typos in URL to the project
2015-05-03 20:53:27 +03:00
43db9cdf4b
turn send button in cancel button while in whisper mode
2015-05-03 09:30:30 +02:00
c4bfffe6a9
mark account with incompatible server when no sasl mechansim could be found
2015-05-02 12:10:56 +02:00
53fea9e1fe
replace send button with quick action button as long as no text has been entered
2015-05-02 11:38:56 +02:00
bcdfdb9ccf
added config option to be a bit more verbose about stanza counts
2015-04-29 16:15:07 +02:00
6a15bc26b6
npe check after reading image uri
2015-04-28 22:23:45 +02:00
93e942f96d
made material icons smaller (24dp)
2015-04-28 14:28:51 +02:00
f3805b8bab
stop conference details from crashing when rotating the screen
2015-04-28 13:56:08 +02:00
51bf8ec98e
fixed npe when rotating screen in contact details activity
2015-04-28 13:31:33 +02:00
b1843fb61a
print stack trace on io error
2015-04-28 09:35:10 +02:00
b10b8e2c50
escape nick in highlight regex pattern
2015-04-28 09:32:58 +02:00
f8e06d8e9a
revert undo timeout to a more reasonable value
2015-04-28 09:25:58 +02:00
4caa92e8ff
handle returning from camera without picture
2015-04-27 12:18:27 +02:00
e11d658f5e
use xmppserviceconnection to send iq packets in jingle connection
2015-04-26 20:27:30 +02:00
c283fec0d1
hard code bitmap configs
2015-04-26 20:26:59 +02:00
0fda254d48
Merge pull request #1135 from BrianBlade/manage_certificates
...
Add option to remove manually approved certificates
2015-04-25 19:09:50 +02:00
5ea1c547d5
fixed service discovery by properly storing and checking identities
2015-04-25 18:24:10 +02:00
82daf849aa
fixed #1039
2015-04-25 14:42:32 +02:00
77caf73103
Merge pull request #1146 from BrianBlade/minor_otr_tweaks
...
OTR: Fix onContactStatusChanged & dont archive OTR
2015-04-25 14:09:38 +02:00
d07baccf97
cleaned up file handling
2015-04-25 14:08:24 +02:00
5e1492fbff
send invite to other instanzes after creating ad hoc conference. fixes #1136
2015-04-23 17:37:47 +02:00
d6443d9b2f
OTR: Fix onContactStatusChanged & dont archive OTR
...
- Fix session handling on contact status change: Do not reset
potentially active sessions; check peer's OTR-resource on disconnect
- use no-permanent-store hint instead of no-store to ensure
finished messages are delivered to offline/disconnected clients
- add no-permanent-store to ask compliant servers not to archive
OTR messages
2015-04-21 22:35:35 +02:00
3a627f72fb
fixed direct invites
2015-04-21 18:36:11 +02:00
5d7e1159f5
always hide pgp snackbar after decrypting a message. fixes #1075
2015-04-20 12:13:47 +02:00
127b7866f0
removed some dead code
2015-04-20 11:49:44 +02:00
d2c9bf31cd
fixed weird touch on snackbar switched conversation bug
...
when touching the border of the snackbar or more precisely the space between the input field and the snackbar Conversations would switch into a random conversation for yet unknown reasons.
2015-04-20 11:39:38 +02:00
9e20a4936e
some code clean up to fix some rare NPE’s
2015-04-19 19:11:32 +02:00
da367dd752
Add option to remove manually approved certificates
...
- "Remove certificates" option brings up a dialog that allows
to delete certificates from MemorizingTrustManager's keystore
- Reconnect active accounts when certificate-settings are changed
- new preference category "Certificate options"
2015-04-19 18:08:13 +02:00
570a22206d
increased undo delay
2015-04-17 20:01:09 +02:00
c4daa08170
fixed a bug in DNS helper code. fixes #1130
2015-04-16 21:56:03 +02:00
65e760aefd
some bug fixes concerning 0byte files. fixes #1126
2015-04-15 15:36:16 +02:00
f99e234b88
maintain state when rotating settings activity
2015-04-14 15:53:50 +02:00
defb127d6e
Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference
...
Conflicts:
src/main/res/values-de/strings.xml
src/main/res/values/strings.xml
2015-04-14 15:17:06 +02:00
261b505f06
always show save button when account info was modified. fixes #918
2015-04-14 15:00:49 +02:00
2f24b09309
fixed disable account when sliding and not clicking the toggle
2015-04-13 18:19:40 +02:00
62faa163f0
fixed typos
2015-04-13 18:18:25 +02:00
8486f47dd9
Merge pull request #1123 from lookshe/development
...
Bugfix for issue #1121
2015-04-13 17:57:33 +02:00
4bf09bc10b
shut up linter
2015-04-13 17:35:20 +02:00
6da77bdf3b
Bugfix for issue #1121
...
check with lowercase to also match JPEG, JPeg ...
changed image url in comment
2015-04-13 16:21:00 +02:00
85cb1e4a37
Maintain private chat on MUC. fixes #1097
2015-04-13 16:00:04 +02:00
845b39cdcc
fixed regression where the selected conversation wasn't highlighted anymore on tabled layout
2015-04-13 15:59:18 +02:00
878066ca99
Add option to use MTM without default TrustManager
...
Add a new "Don't trust system CAs" preference under advanced options
that will change the behaviour of the MemorizingTrustManager. All
formerly unknown certificates will raise a warning if checked.
2015-04-11 15:13:42 +02:00
37d08276a8
allow sharing multiple images at once. fixes #1090
2015-04-11 14:53:10 +02:00
332fe0fd19
don't resume old session when changing resource
2015-04-09 12:46:54 +02:00
dace8ba3d3
Enable end-conversation by swipe gesture
...
Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews
Re-enable selectableItemBackground
Dont end selectedConversation on swipe
Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.
Add blacklistedConversation for undo swipe
Update title_undo_swipe_* strings
Fix undo(), rename blacklistedConversation
Fix discardUndo(); re-init selectedConversation
maintain scroll position after undo
clear notification when dismissing a conversation
modified / simplified maintain scroll position code
simplify handling of selectedConversation
change undo_muc string, remove notifyDataSetChanged()
2015-04-08 23:29:52 +02:00
59ea143147
Merge pull request #1099 from BrianBlade/fix_otr_error_msgs
...
Fix OTR-Error messages (#1021 )
2015-04-02 11:11:22 +02:00
db74cb52c4
Fix OTR-Error messages
...
Send out OTR-Errors on unreadableMessageReceived() as well, not only on
messageFromAnotherInstanceReceived
2015-04-01 20:03:09 +02:00
e64049c4fc
Add toggle account-state switch
...
Add a switch to AccountAdapter that allows self-contained enabling/disabling of
accounts without the need to bring up the context-menu
2015-04-01 12:47:59 +02:00
c47d1e83c1
properly set chat states when receiving otr status messages
2015-03-21 16:43:03 +01:00
99b2ef7e9d
respond to unreadable OTR messages with error message. fixed #1021
2015-03-21 16:07:17 +01:00
da099e5fa4
wait for session iq to return sucessfully before sending other stanzas. fixed #1017
2015-03-20 21:48:45 +01:00
442ae12ee5
don't update presence for muc messages
2015-03-19 19:40:24 +01:00
382bcc4cb5
Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen
...
add delivery receipts for private muc msgs & enable update last-seen for muc-msgs
2015-03-19 18:47:33 +01:00
1c600fefcf
# add delivery receipts for private muc msgs
...
# enable update last-seen for muc-msgs
2015-03-18 21:49:41 +01:00
a13c59fa1b
Merge pull request #1043 from strb/choose_contact_multiple_squashed
...
Added multiple select to Choose Contact Activity (squashed)
2015-03-18 17:36:23 +01:00
f76baa5658
Added multiple select to Choose Contact Activity
...
When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.
The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation
2015-03-18 17:11:50 +01:00
7ae357f863
Merge pull request #1036 from QuentinC/development
...
Green led color is better with "full-green"
2015-03-18 17:11:43 +01:00
52af62d298
Set file size also for cached avatars
2015-03-17 17:36:17 +01:00
74e5317095
Do not Strigprep JIDs from database
2015-03-11 15:59:31 +01:00
4ee4eeb5e7
add context menu entries for geo uris
2015-03-11 15:48:43 +01:00
db6a63bcf6
open location directly from notification
2015-03-10 21:46:13 +01:00
5132cd7234
show geo uris as 'location' in overview
2015-03-10 17:20:50 +01:00
1a5321e41f
Merge pull request #1022 from Boris-de/cipher_blacklist
...
disable all really weak cipher suites
2015-03-08 11:28:39 +01:00
67f8ed44bd
disable all really weak cipher suites
...
With #959 all ciphers of the platform were enabled, but this also
includes several suites that are considered as very weak, even down to
NULL- and anon-ciphers which disable completely disable encryption
and/or authentication. Especially the anon-ciphers could be easily used
for a mitm-attack.
To remove all weak ciphers a blacklist with patterns of cipher-names was
added to Config.java. The blacklist is based on the "mandatory discards"
that Mozilla suggests to not use for TLS-servers because they are weak
or known to be broken.
https://wiki.mozilla.org/Security/Server_Side_TLS#Mandatory_discards
2015-03-07 15:48:29 +01:00
87a048fe6f
display geo uris as location. show 'send loction' in share menu if request location intent can be resolved
2015-03-07 14:15:38 +01:00
cbca92d209
fixed enter is send option
2015-03-06 22:22:50 +01:00
44028a547f
fixed npe in message parser
2015-03-06 21:14:55 +01:00
f25a824610
avoid unnecessary thread creation
2015-03-05 15:46:33 +01:00
c5230e081c
added config option to disable string prep in jids
2015-03-05 10:15:04 +01:00
e10c4e78f1
experimantal in memory jid caching
2015-03-04 19:56:24 +01:00
fb3740f07b
Green led color is better with "full-green"
2015-03-04 00:57:34 +01:00
ac577fe4fd
added methods to count number of unread messages
2015-03-02 11:53:15 +01:00
ff86fa6049
mark all sent messages up to a marker as displayed
2015-03-01 14:15:40 +01:00
d318af098d
merge messages with related status (unsend, send, send_received)
2015-03-01 12:05:54 +01:00
864c709c96
catching out of memory run time exception in hasEnabledAccounts()
2015-02-28 12:03:53 +01:00
98df008bce
use conversations green in notification led
2015-02-27 17:16:28 +01:00
c2ddd74d7f
Merge pull request #1006 from QuentinC/development
...
Some changes to the LED color in notifications !
2015-02-27 17:07:30 +01:00
f3be0d99cc
don't add users with null nicks to muc user list
2015-02-27 17:04:13 +01:00
6ad4865d96
hide change password menu item if server feature is unavailable
2015-02-27 17:03:13 +01:00
c67a481e4b
Update NotificationService.java
...
Revert led light color
2015-02-27 11:18:15 +01:00
71ce73a271
- Update mBuilder in NotificationService.java to ensure that the led is displayed at the right color.
...
CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793
- Changed led Color to green to remember the icon color and led times
2015-02-27 00:33:49 +01:00
Daniel Gultsch