f1d73b9d4e
Use full int range for device IDs
2015-07-19 22:17:57 +02:00
540faeb54b
Clean up unused constant
2015-07-19 22:17:57 +02:00
bd29653a20
Make some fields final
2015-07-19 22:17:57 +02:00
3458f5bb91
Clean up logging
...
Add a fixed prefix to axolotl-related log messages, set log levels
sensibly.
2015-07-19 22:17:57 +02:00
7049904c32
Add basic PEP managemend UI to EditAccountActivity
...
EditAccountActivity now show own fingerprint, and gives an option to
regenerate local keying material (and wipe all sessions associated with
the old keys in the process).
It also now displays a list of other own devices, and gives an option to
remove all but the current device.
2015-07-19 22:17:55 +02:00
37b214a8a8
show contact details in conference details ...
2015-07-19 22:11:51 +02:00
968410ae33
Fix devicelist update handling
...
No longer store own device ID (so that we don't encrypt messages for
ourselves), verify that own device ID is present in update list
(otherwise republish), reflect update in UI.
2015-07-19 21:32:27 +02:00
7a962e5180
Refactor axolotl database recreation
2015-07-19 21:32:27 +02:00
8fd46d40d6
Adapt prettifyFingerprint() to axolotl FP sizes
2015-07-19 21:32:27 +02:00
491f623708
Fix displaying Contact IdentityKeys
...
Migrate ContactDetailsActivity to use new SQL IdentityKeys storage,
remove dead code from Contact class.
2015-07-19 21:32:27 +02:00
0cf64857cf
Only cache session if successfully established
...
When receiving a message, only remember the XmppAxolotlSession wrapper
if the prospective session was actually established. This prevents us
from erroneously adding empty sessions that are never established using
received PreKeyWhisperMessages, which would lead to errors if we try to
use them for sending.
2015-07-19 21:32:27 +02:00
6867b5c3ab
Return empty set on invalid PEP devicelist
2015-07-19 21:32:27 +02:00
25450bf6d3
Trust all IdentityKeys
...
The trust-on-first-use policy leads to problems when receiving messages
from two different devices of a contact before sending a message to them
(as their IdentityKeys will not have been added yet). Since session
trust will be managed externally anyway, this change is not a security
problem, and will allow us to decrypt messages from yet-untrusted
sessions.
2015-07-19 21:32:27 +02:00
bf4185ac08
Refresh PEP on session establish
...
We now track preKeys used to establish incoming sessions with us. On
each new established session, we remove the used prekey from PEP. We
have to do this because libaxolotl-java internally clears the used
preKey from its storage, so we will not be able to establish any future
sessions using that key.
2015-07-19 21:32:27 +02:00
69600502d2
Fix asynchronous axolotl message sending
...
XmppConnectionService.sendMessage() now dispatches messages to the
AxolotlService, where they only are prepared for sending and cached.
AxolotlService now triggers a XmppConnectionService.resendMessage(),
which then handles sending the cached message packet.
This transparently fixes, e.g., handling of messages sent while we are
offline.
2015-07-19 21:32:27 +02:00
ec6870307e
Properly track message sender
...
Previously, the sender was assumed to be the conversation counterpart.
This broke carboned own-device messages. We now track the sender
properly, and also set the status (sent by one of the own devices vs
received from the counterpart) accordingly.
2015-07-19 21:32:27 +02:00
18c1e15d00
Rework PEP content verification
...
Now checks which part(s) are out of sync w/ local storage, and updates
only those, rather than assuming the entire node corrupt and
overwriting it all (especially relevant for preKey list)
2015-07-19 21:32:27 +02:00
9a0232f7e7
Formatting fixes
2015-07-19 21:32:27 +02:00
992cf5652e
When receiving, add mock session if none exists
...
We need a session object in order to build a session from a
PreKeyWhisperMessage, so add an empty one when none exists on receiving
a message.
Warning: this will break right now if the session can not be constructed
from the received message.There will be an invalid session which will
break if we try to send using it.
2015-07-19 21:32:26 +02:00
1b0596d574
Tag messages with originating session
...
This can be used later in order to display trust status of messages, as
well as for potential resending of messages in case of preKey conflicts.
2015-07-19 21:32:26 +02:00
3815d4efa3
Fetch bundles on-demand, encrypt in background
...
Bundles are now fetched on demand when a session needs to be
established. This should lessen the chance of changes to the bundles
occuring before they're used, as well as lessen the load of fetching
bundles.
Also, the message encryption is now done in a background thread, as this
can be somewhat costly if many sessions are present. This is probably
not going to be an issue in real use, but it's good practice anyway.
2015-07-19 21:32:26 +02:00
cb7980c65e
Use bareJid for own session retrieval
2015-07-19 21:32:26 +02:00
c1d23b2395
Migrate to new PEP layout
...
Merge prekeys into bundle node
2015-07-19 21:32:26 +02:00
6492801b89
Formatting fixes
2015-07-19 21:32:26 +02:00
74026b742b
Save IdentityKeys in database
2015-07-19 21:32:26 +02:00
9e07fc5651
DatabaseBackend bugfixes
...
Don't leak cursors, initially create tables
2015-07-19 21:32:26 +02:00
299bbdf27f
Reformat code to use tabs
...
This really sucks to do it like this. Sorry. :(
2015-07-19 21:32:26 +02:00
065519d3f3
Added axolotl activation code to UI
2015-07-19 21:32:26 +02:00
77619b55e4
Added PEP and message protocol layers
...
Can now fetch/retrieve from PEP, as well as encode/decode messages
2015-07-19 21:32:26 +02:00
f73aa1a200
Reworked axolotl protocol layer
...
Numerous fixes
2015-07-19 21:32:25 +02:00
077932eb55
CryptoNext Menu entries added
2015-07-19 21:32:25 +02:00
b8048a5538
CryptoNext persistance layer mockup
...
Initial sketch of the peripheral storage infrastructure for the new
axolotl-based encryption scheme.
2015-07-19 21:32:21 +02:00
9b70c7e68c
bugfix: don't crash if aes key could not be set before jingle transfer
2015-07-19 14:51:04 +02:00
5c017e5186
bugfix: use sendIqPacket method in service instead of invoking XmppConnection directly
2015-07-19 14:25:30 +02:00
0166ced46c
bugfix: accept status code 201 on http upload
2015-07-19 13:36:02 +02:00
f58b2afcaa
changed switch widget
2015-07-18 19:38:52 +02:00
15b880f3a1
pulled translations
2015-07-18 00:02:13 +02:00
ce527c8b76
account for downloaded http files in dup checker
2015-07-18 00:01:34 +02:00
aa1b9de20c
code cleanup
2015-07-17 23:58:53 +02:00
c3584a6db7
fixed inactive http download
2015-07-17 23:58:33 +02:00
13cce172ab
show error message in account details when info has not been edited
2015-07-17 13:14:24 +02:00
1f43115544
increased ibb block size
2015-07-17 13:06:51 +02:00
4f62793a67
version bump to 1.5.0-beta.2
2015-07-16 14:27:36 +02:00
425f0479a8
even less jumpy
2015-07-16 14:06:54 +02:00
6a329c7465
fixed some ux glitches in editaccount
2015-07-16 13:42:52 +02:00
babbd389f6
removed empty translation file
2015-07-16 13:29:59 +02:00
7bd66549d8
made 'check image on http host' message more generic. fixed #1281
2015-07-16 13:25:52 +02:00
b477b8f57b
fixed some npes
2015-07-16 13:14:51 +02:00
b525b42e59
fixed crash on invalid muc bookmarks
2015-07-15 17:42:08 +02:00
ffffca10f0
renamed colors
2015-07-13 12:55:13 +02:00
84bfe8c721
catch exception on broken android phones
2015-07-12 20:17:12 +02:00
558d065d48
made lock button reflect encryption status of the next messages instead of the last
2015-07-12 17:59:22 +02:00
58bc4cba06
only try to change affilations for known jids
2015-07-11 21:24:51 +02:00
4274fe90ac
try to catch weird npe in android sdk
2015-07-11 21:24:30 +02:00
5dd83a5fe6
null check otr fingerprint before display
2015-07-11 21:23:58 +02:00
78aff1329f
renamed HttpConnection to HttpDownloadConnection
2015-07-10 15:14:13 +02:00
ce79f4bbe3
renamed downloadable to transferable
2015-07-10 15:11:03 +02:00
925801c14e
get file upload ready to work with https
2015-07-10 14:14:45 +02:00
0f5c87ca1f
display toast in ui on failed http download
...
fixes #954
2015-07-10 13:28:50 +02:00
b02ef0c62f
show timestamp on images in mucs
...
fixes #1178
2015-07-10 12:42:41 +02:00
492e387482
added null check in sasl response verifier
2015-07-10 12:16:30 +02:00
7eac30d1f4
catch number format exception in server ack
2015-07-10 12:09:59 +02:00
26044ca229
print stack trace instead of writing error message to log in case of unknown exception in dnsutil
2015-07-09 13:40:08 +02:00
ef1429c9a6
show contacts name in non anonymous mucs. fixes #1213
2015-07-05 18:10:18 +02:00
bef731a3c8
refactored sendMessage and merged with resendMessage
2015-07-05 11:59:38 +02:00
2fbeb0bbb2
make sure unread count is initialized as 0. fixes #1270
2015-07-03 22:08:23 +02:00
d30fb6f0a1
avoid very rare npe
2015-07-03 21:32:46 +02:00
1c86098f3b
Merge branch 'master' into development
2015-07-03 13:09:05 +02:00
fc47969741
added fallback for non-srv dns queries
2015-07-03 13:07:48 +02:00
c745fbb562
fixed share with activity to account for http file upload
2015-07-02 23:51:59 +02:00
e4d1bd415d
also offer http download for some 'well known extensions'
2015-07-02 23:19:50 +02:00
f5ba9d4223
refactored message context menu
2015-07-02 23:13:00 +02:00
a2525346f4
moved null check for to and from in message parser
2015-07-02 18:02:32 +02:00
c20a088ea8
changed mime type handling
2015-07-01 16:01:18 +02:00
c36238141d
disable automatic aes encryption for the time being
2015-06-30 20:19:18 +02:00
9190e03076
changed namespace of the http upload feature
2015-06-30 20:11:50 +02:00
aca9d8036c
made httpconnection (download) ready all kind of files
2015-06-30 17:15:02 +02:00
6af97c724c
made storage path decision entirely based upon file extension
2015-06-30 14:04:39 +02:00
d7de311379
refactored bodyContainsDownloadable to be more flexible
2015-06-30 13:52:53 +02:00
5b42b392a1
always show copy original url in context menu when url is available
2015-06-30 13:01:04 +02:00
0030bbf472
untested pgp support for http upload
2015-06-29 15:38:16 +02:00
fdd46f1c91
added trigger to Config.java to always enable aes encryption for uploaded files
2015-06-29 15:21:41 +02:00
82714dedfe
make quick actions available in conferences when file attachment is available
2015-06-29 15:21:41 +02:00
7e11570f2c
show attach button in conferences when http upload is available
2015-06-29 15:21:41 +02:00
9eb9a52205
initial http upload support
...
be careful: little error handling and no encryption
2015-06-29 15:21:41 +02:00
0d01e51da5
don't parse body from muc status messages
2015-06-28 22:14:40 +02:00
46595b6d43
fixed parsing of muc status messages in new message parser
2015-06-28 20:11:28 +02:00
3578263686
pulled new translations from transifex
2015-06-23 12:19:33 +02:00
5a48afdd4d
don't perform dns lookups on domain parts that obviously look like ip addresses
2015-06-19 16:25:08 +02:00
58201b4408
changed paragraph divider
2015-06-10 03:30:17 +02:00
0ea83832cd
pulled new translations from transifex
2015-06-10 03:29:52 +02:00
9d1e8205a2
made i/o and memory intensive operations execute in serial order
2015-06-05 08:46:06 +02:00
a4e9f0c9c0
fixed obvious bug in dns helper
2015-06-04 16:26:51 +02:00
8f07e4c441
streamlined dns helper by ignoring weight
2015-06-04 02:48:07 +02:00
6b794eca2c
send_received muc messages will mark a conversation a read
2015-06-04 02:47:24 +02:00
53e8964dc1
reworked handeling of system contacts
2015-06-03 14:05:54 +02:00
3eab3291de
properly calculate remaining size. should fix #1243
2015-06-03 03:05:20 +02:00
b40922d747
upgrade build tools
2015-06-02 14:10:49 +02:00
fe1cff016f
avoid unnessary muc mam queries when message count is 0 after subject
2015-06-02 13:33:20 +02:00
8ac933be9f
fixed more edge cases in muc message parser
2015-06-02 12:21:35 +02:00
df86b0fc47
improved compatibility with muc components that change the message id
2015-06-02 06:23:32 +02:00
a577ec7c31
let dns library take care of no-srv style hosts as well
2015-05-28 17:31:46 +02:00
5373956e19
use dns library to resolve missing ipv6 or ipv4 addresses
2015-05-28 16:55:48 +02:00
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
a423fc04fa
pulled translations from transifex
2015-05-26 11:09:17 +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
a4ec7a7df1
pulled translations from transifex
2015-05-20 12:26:38 +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
b4a8984b18
pulled new translations from transifex
2015-05-16 10:19:05 +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
ceadf2f6fb
pulled updated translations from transifex
2015-05-11 14:28:36 +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
e1fab8a488
pulled translations from transifex
2015-05-01 13:52:19 +02:00
bcdfdb9ccf
added config option to be a bit more verbose about stanza counts
2015-04-29 16:15:07 +02:00
f0d51fcb77
pulled translations from transifex
2015-04-29 10:19:03 +02:00
6a15bc26b6
npe check after reading image uri
2015-04-28 22:23:45 +02:00
d94c231a74
adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)
2015-04-28 16:25:32 +02:00
92d14c4a00
increased padding on image buttons on v21 to match material guidelines
2015-04-28 14:46:52 +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
a4ff8e3633
increased padding around switches in manage accounts
2015-04-27 12:19:05 +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
7f2a83a684
pulled translations from transifex
2015-04-26 10:48:36 +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
e9783b80d1
added missing translations from transifex
2015-04-21 10:13:28 +02:00
e7972d3d11
pulled latest translations from transifex
2015-04-20 20:32:50 +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
b7b87e1a8d
do not overlap account title and switch
2015-04-01 23:45:46 +02:00
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
1a376cacac
Merge pull request #1076 from rk4an/patch-1
...
Update french translation
2015-04-01 20:30:00 +02:00
64d6a2970e
pulled translations from transifex
2015-04-01 20:26:28 +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
2a73173176
Update french translation
2015-03-22 20:09:53 +01:00
ad8f1902d1
pulled translations
2015-03-22 18:56:28 +01: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
0d6475d0d9
pulled more translations
2015-03-19 19:32: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
4aab45533a
pulled new translations from transifex
2015-03-16 11:52:42 +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
0d6907f1e0
pulled new translations from transifex
2015-02-27 17:20:41 +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
a022e4b41a
reset error status in edit account when reconnecting
2015-02-26 17:17:40 +01:00
9e10c3841e
check for null in jid parser
2015-02-26 16:56:07 +01:00
fa45ceabc9
initilize keys with jsonobject value on parse error
2015-02-26 16:55:49 +01:00
b8bc70aaa0
prevent next button from showing up too early on account setup
2015-02-25 23:48:45 +01:00
3e8314459c
pulled new translations from transifex
2015-02-23 21:56:06 +01:00
8319446c03
reset incoming chat state when going into background
2015-02-23 21:47:35 +01:00
7a62fbbeae
get rid of some useless debugging
2015-02-23 12:05:18 +01:00
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
7259e666ea
look at 5 muc users instead of 4 for tile cache clearing
2015-02-22 13:16:07 +01:00
f52bc4f0be
properly remove invalid avatar
2015-02-22 13:15:27 +01:00
3db5a48529
clear muc tiles cache only when necessary
2015-02-21 22:19:10 +01:00
7ee5e95959
added typing notifications through XEP-0085. fixed #210
2015-02-21 11:06:52 +01:00
f26f6e9a00
fixed #993
2015-02-19 14:36:52 +01:00
2e596c0bd4
launch edit account activity when starting Conversations for the first time (fixed regression)
2015-02-19 13:48:40 +01:00
5003d1f549
made xmpp uris case insensitive
2015-02-18 18:23:13 +01:00
9c2e6392ec
always call to cancel before loading new avatars
2015-02-18 18:12:43 +01:00
b128b33e56
always go through reconnect method instead of just starting XmppConnection threads
2015-02-18 13:37:26 +01:00
da2bc6db23
avoid weird npe. fixed #991
2015-02-18 13:11:41 +01:00
a8ec36cda8
limit ui refresh rate
2015-02-17 14:18:35 +01:00
67d5ee6b71
moved roster loading to async task as well
2015-02-17 11:51:11 +01:00
62b15a5d26
refresh list view more often
2015-02-17 09:53:16 +01:00
a6e6959614
pulled translations from transifex
2015-02-16 16:56:40 +01:00
4e14c89ff8
support for XEP-0092: Software Version
2015-02-16 10:06:09 +01:00
5aa600c638
fixed avatar cache lookup in ListItemAdapter
2015-02-16 00:58:31 +01:00
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
146edb8c81
made image view background more colorful while waiting on actual avatar to load
2015-02-15 23:25:35 +01:00
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
0485da8488
loading avatars in seperate tasks
2015-02-15 18:48:05 +01:00
e68c6a1b74
load messages asynchronously
2015-02-12 18:53:00 +01:00
45de788773
use time instead of uptime for unmute
2015-02-12 18:52:10 +01:00
44ee746681
added actions to error notification
2015-02-10 17:13:34 +01:00
6c8b82dd66
strip fractional seconds from timestamp before parsing
2015-02-10 11:11:01 +01:00
af0c979f45
disabled cipher logging
2015-02-09 16:41:13 +01:00
c3260d620e
Merge pull request #959 from SamWhited/ciphers_fix
...
Ciphers fix
2015-02-09 16:04:54 +01:00
026be61b72
don't show 'enter pgp key' in non encrypted chats
2015-02-09 16:01:30 +01:00
16dc13e4df
always add a non resolved SRV record to the list
2015-02-09 11:54:20 +01:00
ac309efcc8
made delay timestamp parser accept nano seconds
2015-02-09 11:53:35 +01:00
ae8c021c16
sort users in muc
2015-02-07 12:29:32 +01:00
00b2e30938
trim message bodys on display
2015-02-07 12:29:17 +01:00
e1e09d5cba
refactored how snackbar is displayed
2015-02-07 12:17:03 +01:00
03d30e4fdb
Use platform ciphers as well, just prefer ours
2015-02-02 11:16:22 -05:00
bd3fccd2dc
don't disable any ciphers
2015-02-02 14:22:49 +01:00
206fd3fc4b
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-02-02 13:56:32 +01:00
6674a3d757
added more ciphers for old openssl versions
2015-02-02 13:55:56 +01:00
1650565bb0
Remove another unused resource
2015-02-01 16:02:59 -05:00
a4f4fe95ac
Merge pull request #955 from SamWhited/unused_resources
...
Remove unused resources
2015-02-01 17:41:42 +01:00
e0af29f0a3
pulled spanish translations again
2015-02-01 17:33:36 +01:00
735fc655e9
Remove unused resources
2015-02-01 11:32:11 -05:00
33530a9e30
pulled translations from transifex
2015-02-01 17:04:29 +01:00
ce5c6c6257
Removes some unused strings (the legacy SSL stuff)
2015-02-01 08:58:35 -05:00
d0e764c1a5
fixed text preview for images
2015-02-01 12:32:19 +01:00
e76a9c06c3
Remove title_activity_conversations and use app_name instead
2015-01-30 17:02:53 +01:00
3216813e49
made version codes ready for release candidate in beta channel
2015-01-29 23:56:04 +01:00
3a52f31824
don't count when attempt failed completly
2015-01-29 23:35:31 +01:00
6c3ea7f2bd
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-29 23:26:41 +01:00
f2bf64d19d
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-29 23:20:01 +01:00
48604a6620
Use Material Design Icons on API 21+
2015-01-29 15:28:26 -05:00
0eeead495f
properly clear notifications. fixed #921
2015-01-29 13:20:18 +01:00
c237a55093
Merge pull request #941 from SamWhited/snackbar_ordering
...
Show errors before mute snackbar
2015-01-28 13:08:26 +01:00
3c64839daf
fixed broken caps
2015-01-28 00:28:00 +01:00
8cbf610bb2
Show errors before mute snackbar
...
See #939
2015-01-27 08:49:03 -05:00
f8b662e7f8
muc tics for consistency
2015-01-26 01:25:47 +01:00
2a14a0d9b8
changed version code and version name to 1.0-beta2
2015-01-26 00:50:06 +01:00
91e85d2faf
adapt caps on whether or not message confirmation is on
2015-01-26 00:48:56 +01:00
94086bb9b7
don't put ejabberds status code muc messages into an actual conversation
2015-01-26 00:26:16 +01:00
f0d428a56d
made connect time out more failsave
2015-01-25 20:52:53 +01:00
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
1559144701
Merge pull request #933 from betheg/mergeable
...
fix mergable() for /me command.
2015-01-25 19:30:00 +01:00
29331e49b9
fix mergable() for /me command.
2015-01-25 16:58:06 +01:00
14fc520ec0
updated translations
2015-01-25 16:36:57 +01:00
82a74fabc9
set jingle file transfer to offer after iq offer has returned
2015-01-25 16:32:59 +01:00
0f3fb3ab43
Czech translation
...
for "hide offline" added
2015-01-25 16:18:09 +01:00
7800647885
otr: switch to the otr-state the partner alternate.
...
should also fixed #877
2015-01-25 13:07:31 +01:00
8041d23cb1
MessageParser: fix the regex for otr query messages.
2015-01-24 16:19:58 +01:00
7769d305e6
Merge pull request #924 from andersruneson/changeonlinecolor
...
Changed online color to green instead of primary
2015-01-24 00:28:29 +01:00
b9af38464e
fixed mam to work with muc
2015-01-24 00:22:51 +01:00
cbebd14dbd
Changed online color to green instead of primary
2015-01-23 22:28:10 +01:00
4e50098e31
show checkbox to hide offline contacts
2015-01-21 17:24:02 +01:00
2dc69eea68
fixed bug in find conference in database method
2015-01-21 16:18:57 +01:00
00c74503ab
deal with user entering full jids in join conference dialog
2015-01-21 16:18:38 +01:00
be9af442ef
always allow access to contact details. provide add button in contact details
2015-01-21 15:31:40 +01:00
764ef3c8cd
Add block/unblock to contact details menu
...
See #889
2015-01-21 13:07:36 +01:00
818c0e609c
Merge pull request #908 from betheg/otr4j
...
otr4j: update to 0.22
2015-01-21 11:48:42 +01:00
e42e0f88e1
Add color / category to foreground notification
2015-01-20 20:32:27 -05:00
7839438f51
changed message duplicate finder
2015-01-20 22:54:58 +01:00
6dc53c2b35
fixed missing image preview
2015-01-20 22:54:26 +01:00
04f4680582
fixed up button on v21 devices
2015-01-20 22:53:45 +01:00
fa7d748c3f
otr4j: update to 0.22
2015-01-20 18:01:39 +01:00
32a16137df
Fixed action bar search for Android 5.0
2015-01-20 14:53:47 +01:00
7e4053abff
Czech translation updated
...
for Conversations
2015-01-19 19:07:43 +01:00
503237087f
Remove legacy SSL support
2015-01-19 11:02:13 -05:00
1e607d7b1b
don't trim bodies
2015-01-19 12:15:27 +01:00
c5d087ad55
fetched translations from transifex
2015-01-19 12:14:55 +01:00
4cbf8120f5
fixed legacy translation of image received
2015-01-19 12:14:30 +01:00
e5dffcfb07
added changelog for 1.0
2015-01-19 11:32:27 +01:00
100ba6e7e7
check for deleted files when loading more messages from history
2015-01-19 11:23:05 +01:00
7af588c8b3
account for rounding errors when rescheduling wake up
2015-01-19 11:17:27 +01:00
fc2e458053
fixed bug when sharing files from google drive
2015-01-18 20:27:16 +01:00
149a6716b8
proper desc for offering and sending images in conversations overview
2015-01-18 20:26:22 +01:00
6756386eee
explain read marker
2015-01-18 13:44:18 +01:00
d58fadd05f
use same helper methods for images and files
2015-01-18 13:00:57 +01:00
d453e5501b
Merge pull request #899 from SamWhited/api21_notifications
...
Add some Android 21 notification features
2015-01-18 11:58:11 +01:00
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
ae16439bd6
Added new file type names for file transfers
...
- apk
- vcard
2015-01-18 11:17:27 +01:00
99989cd1d5
Add some Android 21 notification features
2015-01-17 23:41:57 -05:00
83c806a774
Fix string substitutions with unknown filetypes
2015-01-17 20:53:25 -05:00
dfc1cea882
Correct the download file string on notifications
...
Fixes #896
2015-01-17 09:11:04 -05:00
edd58f19b4
Add download button on notification if applicable
2015-01-16 01:10:01 -05:00
dc8b467cf6
sending read marker when resuming activity and conversation is open
2015-01-15 16:32:24 +01:00
c0993a9acb
show toast when avatar has been published - fixed #874
2015-01-15 16:26:46 +01:00
994c9495ba
added dedicated button to disable foreground service in perma notification
2015-01-15 16:17:55 +01:00
351e5d7065
fixed #888
2015-01-15 15:45:11 +01:00
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
a6a9ed4877
handle muc nicks with white spaces. fixed #884
2015-01-14 22:48:14 +01:00
0a96bec3c1
Add option to swap enter/emoticon key
2015-01-14 16:14:14 -05:00
548a585b2c
Harden the TLS connection cipher suites
2015-01-14 13:10:15 -05:00
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
caf861d96f
Ensure type safety in Pebble notifications
...
Also use forward-compatible screen-on detection
2015-01-13 23:18:35 -05:00
acb3aed99c
Fix bottom padding on about page
2015-01-13 21:29:47 -05:00
7d2a9624b5
make use of different dimensions for different screen sizes
2015-01-13 11:52:41 +01:00
1262a7cba7
Merge pull request #872 from Elinvention/development
...
Updated Italian translations
2015-01-13 10:48:02 +01:00
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
d9c2fa39cd
Use margin instead of padding in about screen
2015-01-12 23:08:26 -05:00
8f6ee1fe22
Updated Italian translations
2015-01-13 01:32:51 +01:00
c920a09a0c
Czech translation
...
updated
2015-01-12 20:07:26 +01:00
dd5101ff5c
catch bug in guessContentType
2015-01-12 18:40:15 +01:00
8d3323e384
context menu for files and offered files. fixed #848 fixed #849
2015-01-12 16:42:20 +01:00
77e4e1c2ac
reworked message preview / message meta information (ie file offered, received * file)
...
fixed #837
2015-01-12 16:09:39 +01:00
50c8065015
Merge pull request #866 from SamWhited/xep0245
...
Add XEP-0245 (/me command) support
2015-01-12 01:22:40 +01:00
3c5224251c
Add XEP-0245 (/me command) support
2015-01-11 18:32:00 -05:00
ef6e4c5dd5
do not check image file size over http if accepted file size is 0
2015-01-11 22:18:18 +01:00
b07b7519a6
keep proper image file extension
2015-01-11 15:19:36 +01:00
0aa50cb5a1
shortened some string
2015-01-11 01:01:33 +01:00
e34bc920e4
fixed #860
2015-01-10 23:56:56 +01:00
18eb187949
make room persistant when changing subject or other muc options
2015-01-10 23:10:32 +01:00
158f5dd17c
don't crash when selecting a conversation by uuid did not work
2015-01-10 19:43:23 +01:00
c89fdec0b1
fixed regression in tablet ui
2015-01-09 22:24:50 +01:00
06eae476ee
Introduced expert options to control enter-is-send
...
(default == off)
2015-01-09 19:23:26 +01:00
0a48f777ac
code cleanup for jingle proxy discovery
2015-01-09 14:42:58 +01:00
d9f88c4669
ensure that everyone is member before making a room private
2015-01-09 13:28:01 +01:00
734a9934a3
make project translatable via transifex
2015-01-09 02:06:03 +01:00
ffa97c48f5
added missing drawables
2015-01-08 23:02:31 +01:00
a9159568b9
allow for very basic muc configuration
2015-01-08 21:29:26 +01:00
0fe193b027
code cleanup
2015-01-08 14:45:44 +01:00
f8aa1bfec4
kick after ban
2015-01-08 01:23:53 +01:00
f8dc59be81
fixed german translation
2015-01-08 00:41:37 +01:00
061de5205e
some clean ups for affiliation change context menu
2015-01-08 00:23:26 +01:00
cff9a937f2
Merge pull request #851 from kriztan/patch-2
...
Updated German translations for more muc options
2015-01-07 23:53:36 +01:00
20aa7bea47
Merge pull request #852 from SamWhited/ellipsis
...
s/.../…/ in CS strings
2015-01-07 23:53:26 +01:00
8505102cee
Merge pull request #850 from plsng/dutch
...
Update Dutch translations
2015-01-07 23:53:08 +01:00
e1ea20b392
s/.../…/ in CS strings
...
[ci skip]
2015-01-07 13:42:49 -05:00
45c1e88a08
Updated German translations for more muc options
2015-01-07 19:06:18 +01:00
c9dc82d134
Update Dutch translations
2015-01-07 18:49:13 +01:00
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
d70b5f93f3
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-07 18:32:51 +01:00
8ab19faddd
Merge pull request #847 from kriztan/patch-1
...
Updated German translations...
2015-01-07 18:30:16 +01:00
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
0ad8796b44
fixed invites
2015-01-07 16:45:44 +01:00
af1410b02a
Merge pull request #845 from SamWhited/material
...
Add materials theme for v21 devices
2015-01-07 15:57:27 +01:00
ef525fb10e
basic affiliation changes in muc
2015-01-07 15:03:29 +01:00
81e9afdf19
reset next encryption when archiving conversations
2015-01-07 12:20:39 +01:00
943a01b9bf
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-07 10:49:40 +01:00
a7ee9cc41b
Merge pull request #846 from kruks23/translation4
...
Update spanish translation
2015-01-07 10:28:37 +01:00
a1a2a39108
Update affiliation in MUC details and advance mode
2015-01-07 08:50:19 +01:00
45bb59dba8
Add materials theme
2015-01-06 21:37:49 -05:00
a22c8c04d8
use copyonwritearraylist in for phone helper
2015-01-07 01:01:15 +01:00
d502e57661
refactored UiHelper
2015-01-07 00:59:42 +01:00
066f60a23c
Czech translation for - show affiliation instead of role in MucDetails
2015-01-06 21:15:32 +01:00
f02f510c18
fixed bug in new ping strategy
2015-01-06 19:46:52 +01:00
353f4e38bb
mark sent images as sent_received instead of sent
...
fixed #842
2015-01-06 18:44:34 +01:00
8a3ccfd456
Merge pull request #841 from BenoitBouvarel/patch-2
...
Update strings.xml
2015-01-06 18:33:56 +01:00
562699c745
run invalidateOptionsMenu on uiThread
2015-01-06 18:26:14 +01:00
4b0043ba91
fixed potential NPEs in ShareWithActivity
2015-01-06 18:25:31 +01:00
352af145f8
Update strings.xml
...
char ">" was missing at line 285
2015-01-06 01:23:51 +01:00
f8758b7bd5
Update strings.xml
...
French translation updated
2015-01-05 23:42:37 +01:00
777e060100
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-05 18:47:04 +01:00
Andreas Straub