Commit Graph

157 Commits

Author SHA1 Message Date
Daniel Gultsch
4151b72a6e let jingle connection and manager handle message status 2015-05-16 04:12:53 +02:00
Daniel Gultsch
6489ddac6c clear avatar cache when uploading new avatar 2015-05-13 14:33:52 +02:00
Daniel Gultsch
d3a6aa9f7a handle conference invites differently to deal with killed activities. fixes #1188 2015-05-12 04:33:04 +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
05f0aa614f fixed npe when binval value of vcard avatar is null 2015-05-07 11:07:15 +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
93e942f96d made material icons smaller (24dp) 2015-04-28 14:28:51 +02:00
Daniel Gultsch
b10b8e2c50 escape nick in highlight regex pattern 2015-04-28 09:32:58 +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
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
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
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
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
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
7ae357f863 Merge pull request #1036 from QuentinC/development
Green led color is better with "full-green"
2015-03-18 17:11:43 +01:00
iNPUTmice
db6a63bcf6 open location directly from notification 2015-03-10 21:46:13 +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
f25a824610 avoid unnecessary thread creation 2015-03-05 15:46:33 +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
98df008bce use conversations green in notification led 2015-02-27 17:16:28 +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
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
7ee5e95959 added typing notifications through XEP-0085. fixed #210 2015-02-21 11:06:52 +01:00
iNPUTmice
b128b33e56 always go through reconnect method instead of just starting XmppConnection threads 2015-02-18 13:37:26 +01:00
iNPUTmice
67d5ee6b71 moved roster loading to async task as well 2015-02-17 11:51:11 +01: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
44ee746681 added actions to error notification 2015-02-10 17:13:34 +01:00
Sam Whited
48604a6620 Use Material Design Icons on API 21+ 2015-01-29 15:28:26 -05:00
iNPUTmice
91e85d2faf adapt caps on whether or not message confirmation is on 2015-01-26 00:48:56 +01:00
iNPUTmice
f0d428a56d made connect time out more failsave 2015-01-25 20:52:53 +01:00
iNPUTmice
b9af38464e fixed mam to work with muc 2015-01-24 00:22:51 +01:00
iNPUTmice
00c74503ab deal with user entering full jids in join conference dialog 2015-01-21 16:18:38 +01:00
Daniel Gultsch
818c0e609c Merge pull request #908 from betheg/otr4j
otr4j: update to 0.22
2015-01-21 11:48:42 +01:00
Sam Whited
e42e0f88e1 Add color / category to foreground notification 2015-01-20 20:32:27 -05:00
Michael
fa7d748c3f otr4j: update to 0.22 2015-01-20 18:01:39 +01:00
iNPUTmice
4cbf8120f5 fixed legacy translation of image received 2015-01-19 12:14:30 +01:00
iNPUTmice
100ba6e7e7 check for deleted files when loading more messages from history 2015-01-19 11:23:05 +01:00
iNPUTmice
7af588c8b3 account for rounding errors when rescheduling wake up 2015-01-19 11:17:27 +01:00
Sam Whited
99989cd1d5 Add some Android 21 notification features 2015-01-17 23:41:57 -05:00
Sam Whited
dfc1cea882 Correct the download file string on notifications
Fixes #896
2015-01-17 09:11:04 -05:00