Daniel Gultsch
e6d336c293
Merge branch 'development' of github.com:siacs/Conversations into development
2015-05-10 11:45:01 +02:00
Daniel Gultsch
1e28f60038
changed conversation red to material red
2015-05-10 03:14:13 +02:00
Daniel Gultsch
4c486f5e58
paint single unicode hearts as red and slightly larger
2015-05-10 03:12:44 +02:00
Andreas Shimokawa
9e78e3e09d
only forward incoming chat messages to Pebble App and Gadgetbridge
2015-05-08 21:36:20 +02:00
Daniel Gultsch
d9e5035c08
config option to reset attempt counts when changing network (default=true)
2015-05-08 06:50:28 +02:00
Daniel Gultsch
c4a4dd2392
throw proper exception before changing account into error state
2015-05-08 06:30:06 +02:00
Daniel Gultsch
e0653c0371
fixed encrypted ibb file transfer which was broken with ART. fixes #1172
2015-05-07 14:19:51 +02:00
Daniel Gultsch
05f0aa614f
fixed npe when binval value of vcard avatar is null
2015-05-07 11:07:15 +02:00
Daniel Gultsch
d74e8a8a0e
fixed npe when missing instructions on failed register
2015-05-06 04:33:21 +02:00
Daniel Gultsch
db726a59b8
fwiw don't allow stanza count to go over MAX_INT
2015-05-06 04:29:45 +02:00
Daniel Gultsch
b7c672e10e
avoid fetching avatars multiple times in parallel
2015-05-05 10:29:41 +02:00
Daniel Gultsch
5136bf9832
r/o support for vcard avatars. pep avatars will be prefered
2015-05-05 06:17:34 +02:00
Daniel Gultsch
e6aa604ade
enabled sm logging by default at least for development branch
2015-05-05 06:10:47 +02:00
Daniel Gultsch
61fd5d6696
clean up in attachment chooser code. fixed #1168
2015-05-04 09:54:10 +02:00
Daniel Gultsch
2582ece210
open market if share location plugin isn't installed
2015-05-04 04:38:12 +02:00
Alexander Groshev
d15da64c5d
Fix typos in URL to the project
2015-05-03 20:53:27 +03:00
Daniel Gultsch
43db9cdf4b
turn send button in cancel button while in whisper mode
2015-05-03 09:30:30 +02:00
Daniel Gultsch
c4bfffe6a9
mark account with incompatible server when no sasl mechansim could be found
2015-05-02 12:10:56 +02:00
Daniel Gultsch
53fea9e1fe
replace send button with quick action button as long as no text has been entered
2015-05-02 11:38:56 +02:00
Daniel Gultsch
e1fab8a488
pulled translations from transifex
2015-05-01 13:52:19 +02:00
Daniel Gultsch
bcdfdb9ccf
added config option to be a bit more verbose about stanza counts
2015-04-29 16:15:07 +02:00
Daniel Gultsch
f0d51fcb77
pulled translations from transifex
2015-04-29 10:19:03 +02:00
Daniel Gultsch
6a15bc26b6
npe check after reading image uri
2015-04-28 22:23:45 +02:00
Daniel Gultsch
d94c231a74
adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)
2015-04-28 16:25:32 +02:00
Daniel Gultsch
92d14c4a00
increased padding on image buttons on v21 to match material guidelines
2015-04-28 14:46:52 +02:00
Daniel Gultsch
93e942f96d
made material icons smaller (24dp)
2015-04-28 14:28:51 +02:00
Daniel Gultsch
f3805b8bab
stop conference details from crashing when rotating the screen
2015-04-28 13:56:08 +02:00
Daniel Gultsch
51bf8ec98e
fixed npe when rotating screen in contact details activity
2015-04-28 13:31:33 +02:00
Daniel Gultsch
b1843fb61a
print stack trace on io error
2015-04-28 09:35:10 +02:00
Daniel Gultsch
b10b8e2c50
escape nick in highlight regex pattern
2015-04-28 09:32:58 +02:00
Daniel Gultsch
f8e06d8e9a
revert undo timeout to a more reasonable value
2015-04-28 09:25:58 +02:00
Daniel Gultsch
a4ff8e3633
increased padding around switches in manage accounts
2015-04-27 12:19:05 +02:00
Daniel Gultsch
4caa92e8ff
handle returning from camera without picture
2015-04-27 12:18:27 +02:00
Daniel Gultsch
e11d658f5e
use xmppserviceconnection to send iq packets in jingle connection
2015-04-26 20:27:30 +02:00
Daniel Gultsch
c283fec0d1
hard code bitmap configs
2015-04-26 20:26:59 +02:00
Daniel Gultsch
7f2a83a684
pulled translations from transifex
2015-04-26 10:48:36 +02:00
Daniel Gultsch
0fda254d48
Merge pull request #1135 from BrianBlade/manage_certificates
...
Add option to remove manually approved certificates
2015-04-25 19:09:50 +02:00
Daniel Gultsch
5ea1c547d5
fixed service discovery by properly storing and checking identities
2015-04-25 18:24:10 +02:00
Daniel Gultsch
82daf849aa
fixed #1039
2015-04-25 14:42:32 +02:00
Daniel Gultsch
77caf73103
Merge pull request #1146 from BrianBlade/minor_otr_tweaks
...
OTR: Fix onContactStatusChanged & dont archive OTR
2015-04-25 14:09:38 +02:00
Daniel Gultsch
d07baccf97
cleaned up file handling
2015-04-25 14:08:24 +02:00
Daniel Gultsch
5e1492fbff
send invite to other instanzes after creating ad hoc conference. fixes #1136
2015-04-23 17:37:47 +02:00
BrianBlade
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
Daniel Gultsch
3a627f72fb
fixed direct invites
2015-04-21 18:36:11 +02:00
Daniel Gultsch
e9783b80d1
added missing translations from transifex
2015-04-21 10:13:28 +02:00
Daniel Gultsch
e7972d3d11
pulled latest translations from transifex
2015-04-20 20:32:50 +02:00
Daniel Gultsch
5d7e1159f5
always hide pgp snackbar after decrypting a message. fixes #1075
2015-04-20 12:13:47 +02:00
Daniel Gultsch
127b7866f0
removed some dead code
2015-04-20 11:49:44 +02:00
Daniel Gultsch
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
Daniel Gultsch
9e20a4936e
some code clean up to fix some rare NPE’s
2015-04-19 19:11:32 +02:00
BrianBlade
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
iNPUTmice
570a22206d
increased undo delay
2015-04-17 20:01:09 +02:00
iNPUTmice
c4daa08170
fixed a bug in DNS helper code. fixes #1130
2015-04-16 21:56:03 +02:00
iNPUTmice
65e760aefd
some bug fixes concerning 0byte files. fixes #1126
2015-04-15 15:36:16 +02:00
iNPUTmice
f99e234b88
maintain state when rotating settings activity
2015-04-14 15:53:50 +02:00
iNPUTmice
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
iNPUTmice
261b505f06
always show save button when account info was modified. fixes #918
2015-04-14 15:00:49 +02:00
iNPUTmice
2f24b09309
fixed disable account when sliding and not clicking the toggle
2015-04-13 18:19:40 +02:00
iNPUTmice
62faa163f0
fixed typos
2015-04-13 18:18:25 +02:00
Daniel Gultsch
8486f47dd9
Merge pull request #1123 from lookshe/development
...
Bugfix for issue #1121
2015-04-13 17:57:33 +02:00
iNPUTmice
4bf09bc10b
shut up linter
2015-04-13 17:35:20 +02:00
lookshe
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
iNPUTmice
85cb1e4a37
Maintain private chat on MUC. fixes #1097
2015-04-13 16:00:04 +02:00
iNPUTmice
845b39cdcc
fixed regression where the selected conversation wasn't highlighted anymore on tabled layout
2015-04-13 15:59:18 +02:00
BrianBlade
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
iNPUTmice
37d08276a8
allow sharing multiple images at once. fixes #1090
2015-04-11 14:53:10 +02:00
iNPUTmice
332fe0fd19
don't resume old session when changing resource
2015-04-09 12:46:54 +02:00
BrianBlade
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
Daniel Gultsch
59ea143147
Merge pull request #1099 from BrianBlade/fix_otr_error_msgs
...
Fix OTR-Error messages (#1021 )
2015-04-02 11:11:22 +02:00
iNPUTmice
b7b87e1a8d
do not overlap account title and switch
2015-04-01 23:45:46 +02:00
iNPUTmice
cb29c5bb15
Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch
2015-04-01 23:24:35 +02:00
Daniel Gultsch
1a376cacac
Merge pull request #1076 from rk4an/patch-1
...
Update french translation
2015-04-01 20:30:00 +02:00
iNPUTmice
64d6a2970e
pulled translations from transifex
2015-04-01 20:26:28 +02:00
BrianBlade
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
BrianBlade
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
Erkan
2a73173176
Update french translation
2015-03-22 20:09:53 +01:00
iNPUTmice
ad8f1902d1
pulled translations
2015-03-22 18:56:28 +01:00
iNPUTmice
c47d1e83c1
properly set chat states when receiving otr status messages
2015-03-21 16:43:03 +01:00
iNPUTmice
99b2ef7e9d
respond to unreadable OTR messages with error message. fixed #1021
2015-03-21 16:07:17 +01:00
iNPUTmice
da099e5fa4
wait for session iq to return sucessfully before sending other stanzas. fixed #1017
2015-03-20 21:48:45 +01:00
iNPUTmice
442ae12ee5
don't update presence for muc messages
2015-03-19 19:40:24 +01:00
iNPUTmice
0d6475d0d9
pulled more translations
2015-03-19 19:32:24 +01:00
Daniel Gultsch
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
BrianBlade
1c600fefcf
# add delivery receipts for private muc msgs
...
# enable update last-seen for muc-msgs
2015-03-18 21:49:41 +01:00
Daniel Gultsch
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
Andreas Straub
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
Daniel Gultsch
7ae357f863
Merge pull request #1036 from QuentinC/development
...
Green led color is better with "full-green"
2015-03-18 17:11:43 +01:00
Holger Weiß
52af62d298
Set file size also for cached avatars
2015-03-17 17:36:17 +01:00
iNPUTmice
4aab45533a
pulled new translations from transifex
2015-03-16 11:52:42 +01:00
Mateusz "maxmati" Nowoty?ski
74e5317095
Do not Strigprep JIDs from database
2015-03-11 15:59:31 +01:00
iNPUTmice
4ee4eeb5e7
add context menu entries for geo uris
2015-03-11 15:48:43 +01:00
iNPUTmice
db6a63bcf6
open location directly from notification
2015-03-10 21:46:13 +01:00
iNPUTmice
5132cd7234
show geo uris as 'location' in overview
2015-03-10 17:20:50 +01:00
Daniel Gultsch
1a5321e41f
Merge pull request #1022 from Boris-de/cipher_blacklist
...
disable all really weak cipher suites
2015-03-08 11:28:39 +01:00
Boris Wachtmeister
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
iNPUTmice
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
iNPUTmice
cbca92d209
fixed enter is send option
2015-03-06 22:22:50 +01:00
iNPUTmice
44028a547f
fixed npe in message parser
2015-03-06 21:14:55 +01:00
iNPUTmice
f25a824610
avoid unnecessary thread creation
2015-03-05 15:46:33 +01:00
iNPUTmice
c5230e081c
added config option to disable string prep in jids
2015-03-05 10:15:04 +01:00
iNPUTmice
e10c4e78f1
experimantal in memory jid caching
2015-03-04 19:56:24 +01:00
Quentin
fb3740f07b
Green led color is better with "full-green"
2015-03-04 00:57:34 +01:00
Daniel Gultsch
ac577fe4fd
added methods to count number of unread messages
2015-03-02 11:53:15 +01:00
Daniel Gultsch
ff86fa6049
mark all sent messages up to a marker as displayed
2015-03-01 14:15:40 +01:00
iNPUTmice
d318af098d
merge messages with related status (unsend, send, send_received)
2015-03-01 12:05:54 +01:00
iNPUTmice
864c709c96
catching out of memory run time exception in hasEnabledAccounts()
2015-02-28 12:03:53 +01:00
iNPUTmice
0d6907f1e0
pulled new translations from transifex
2015-02-27 17:20:41 +01:00
iNPUTmice
98df008bce
use conversations green in notification led
2015-02-27 17:16:28 +01:00
Daniel Gultsch
c2ddd74d7f
Merge pull request #1006 from QuentinC/development
...
Some changes to the LED color in notifications !
2015-02-27 17:07:30 +01:00
iNPUTmice
f3be0d99cc
don't add users with null nicks to muc user list
2015-02-27 17:04:13 +01:00
iNPUTmice
6ad4865d96
hide change password menu item if server feature is unavailable
2015-02-27 17:03:13 +01:00
QuentinC
c67a481e4b
Update NotificationService.java
...
Revert led light color
2015-02-27 11:18:15 +01:00
Quentin
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
iNPUTmice
a022e4b41a
reset error status in edit account when reconnecting
2015-02-26 17:17:40 +01:00
iNPUTmice
9e10c3841e
check for null in jid parser
2015-02-26 16:56:07 +01:00
iNPUTmice
fa45ceabc9
initilize keys with jsonobject value on parse error
2015-02-26 16:55:49 +01:00
iNPUTmice
b8bc70aaa0
prevent next button from showing up too early on account setup
2015-02-25 23:48:45 +01:00
iNPUTmice
3e8314459c
pulled new translations from transifex
2015-02-23 21:56:06 +01:00
iNPUTmice
8319446c03
reset incoming chat state when going into background
2015-02-23 21:47:35 +01:00
iNPUTmice
7a62fbbeae
get rid of some useless debugging
2015-02-23 12:05:18 +01:00
iNPUTmice
da2da75756
init mode (first start) for StartConversationActivity (no up button) and avoid being started multiple times. fixed #995
2015-02-22 13:24:29 +01:00
iNPUTmice
7259e666ea
look at 5 muc users instead of 4 for tile cache clearing
2015-02-22 13:16:07 +01:00
iNPUTmice
f52bc4f0be
properly remove invalid avatar
2015-02-22 13:15:27 +01:00
iNPUTmice
3db5a48529
clear muc tiles cache only when necessary
2015-02-21 22:19:10 +01:00
iNPUTmice
7ee5e95959
added typing notifications through XEP-0085. fixed #210
2015-02-21 11:06:52 +01:00
iNPUTmice
f26f6e9a00
fixed #993
2015-02-19 14:36:52 +01:00
iNPUTmice
2e596c0bd4
launch edit account activity when starting Conversations for the first time (fixed regression)
2015-02-19 13:48:40 +01:00
iNPUTmice
5003d1f549
made xmpp uris case insensitive
2015-02-18 18:23:13 +01:00
iNPUTmice
9c2e6392ec
always call to cancel before loading new avatars
2015-02-18 18:12:43 +01:00
iNPUTmice
b128b33e56
always go through reconnect method instead of just starting XmppConnection threads
2015-02-18 13:37:26 +01:00
iNPUTmice
da2bc6db23
avoid weird npe. fixed #991
2015-02-18 13:11:41 +01:00
iNPUTmice
a8ec36cda8
limit ui refresh rate
2015-02-17 14:18:35 +01:00
iNPUTmice
67d5ee6b71
moved roster loading to async task as well
2015-02-17 11:51:11 +01:00
iNPUTmice
62b15a5d26
refresh list view more often
2015-02-17 09:53:16 +01:00
iNPUTmice
a6e6959614
pulled translations from transifex
2015-02-16 16:56:40 +01:00
iNPUTmice
4e14c89ff8
support for XEP-0092: Software Version
2015-02-16 10:06:09 +01:00
iNPUTmice
5aa600c638
fixed avatar cache lookup in ListItemAdapter
2015-02-16 00:58:31 +01:00
Daniel Gultsch
178004996b
Merge pull request #986 from singpolyma/vitelity-s.ms-compatability
...
Vitelity's s.ms service requires <body> first
2015-02-15 23:28:22 +01:00
iNPUTmice
146edb8c81
made image view background more colorful while waiting on actual avatar to load
2015-02-15 23:25:35 +01:00
Stephen Paul Weber
00fa6f89d6
Vitelity's s.ms service requires <body> first
...
If the <body> tag is not first, their bot just silently drops the
stanza. I know we shouldn't have to care about order, and I'm trying to
get them to fix it, but it's not high-priority for them since "most"
clients seem to work, so I'd like this workaround in.
2015-02-15 14:18:41 -05:00
iNPUTmice
0485da8488
loading avatars in seperate tasks
2015-02-15 18:48:05 +01:00
iNPUTmice
e68c6a1b74
load messages asynchronously
2015-02-12 18:53:00 +01:00
iNPUTmice
45de788773
use time instead of uptime for unmute
2015-02-12 18:52:10 +01:00
iNPUTmice
44ee746681
added actions to error notification
2015-02-10 17:13:34 +01:00
iNPUTmice
6c8b82dd66
strip fractional seconds from timestamp before parsing
2015-02-10 11:11:01 +01:00
iNPUTmice
af0c979f45
disabled cipher logging
2015-02-09 16:41:13 +01:00
Daniel Gultsch
c3260d620e
Merge pull request #959 from SamWhited/ciphers_fix
...
Ciphers fix
2015-02-09 16:04:54 +01:00
iNPUTmice
026be61b72
don't show 'enter pgp key' in non encrypted chats
2015-02-09 16:01:30 +01:00
iNPUTmice
16dc13e4df
always add a non resolved SRV record to the list
2015-02-09 11:54:20 +01:00
iNPUTmice
ac309efcc8
made delay timestamp parser accept nano seconds
2015-02-09 11:53:35 +01:00
