Commit Graph

2912 Commits

Author SHA1 Message Date
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
Daniel Gultsch
f880473435 Merge pull request #1104 from BrianBlade/feature/swipe_out_conversation
Enable end-conversation by swipe gesture
2015-04-09 10:46:26 +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
ef68084098 Merge branch 'BrianBlade-account_state_switch' into development 2015-04-01 23:46:54 +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
7eabdfd80f bump version code 2015-03-22 19:42:40 +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
825278971e Merge branch 'development' of github.com:siacs/Conversations into development 2015-03-20 22:40:06 +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
Daniel Gultsch
30e2dee456 Update CHANGELOG.md
fixed plugin link
2015-03-19 19:45:47 +01:00
iNPUTmice
5793fb680f version bump to 1.2.0-beta 2015-03-19 19:40:42 +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
Daniel Gultsch
ae274ac728 Merge pull request #1041 from weiss/fix-cached-avatar-size
Set file size also for cached avatars
2015-03-17 21:10:02 +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
iNPUTmice
3d570f4a08 updated changelong 2015-03-11 18:18:07 +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
16c6f8d2ff another teaser task for gsoc 2015-03-06 14:39:05 +01:00
iNPUTmice
ce9aede11c fixed markdown syntax in todo list 2015-03-06 14:27:09 +01:00
iNPUTmice
a385b6ce0b added short todo list 2015-03-06 14:25:17 +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