Commit graph

3572 commits

Author SHA1 Message Date
Daniel Gultsch
d1a456f3e3 made hard coded choice for encryptions more flexible and disable parsing 2016-02-24 14:47:49 +01:00
steckbrief
bad1569136 Unused imports / methods removed 2016-02-24 13:22:24 +01:00
steckbrief
2803cbda26 Fixes FS#89 after merge conflict 2016-02-24 13:11:24 +01:00
steckbrief
8b0ffd048e Fixed merge issue for resolving FS#47 (preferences involved in the decision for auto downloading image links moved to global Utility Class) 2016-02-24 13:02:33 +01:00
steckbrief
7d95bb6038 Readded MessageDetailsDialog to message context menu after merge 2016-02-24 12:53:17 +01:00
steckbrief
a2fe9f151a Reviewed commit for FS#34 after merge 2016-02-24 12:24:46 +01:00
Daniel Gultsch
ddafa65849 Merge pull request #1715 from fiaxh/gpg_decryption_failed
PGP Retry decryption from message menu
2016-02-24 09:23:30 +01:00
steckbrief
5fcd69c68b Packet sending helper moved to XmppSendUtil and methods in XmppConnectionService marked as deprecated 2016-02-23 22:40:43 +01:00
Daniel Gultsch
17b1fcc3ea set noMessagesLeftOnServer before conference configuration fetch 2016-02-23 16:15:55 +01:00
Daniel Gultsch
34f2a63190 update notification after message correction 2016-02-23 16:15:23 +01:00
Daniel Gultsch
0298f0181e reset pending subscription request when receiving roster update 2016-02-23 16:14:55 +01:00
fiaxh
894b5892a9 Retry decryption from message menu 2016-02-23 16:05:42 +01:00
steckbrief
6d4a55a087 Removed stupid message correction 2016-02-23 14:33:40 +01:00
Daniel Gultsch
20eebe638b Revert "disable predexing on travis"
This reverts commit ad063d00cc.
2016-02-23 14:33:03 +01:00
Daniel Gultsch
ad063d00cc disable predexing on travis 2016-02-23 14:25:13 +01:00
Daniel Gultsch
beb216c300 made presences object final in contact 2016-02-23 14:25:01 +01:00
Daniel Gultsch
7f45e210af fixed typo in travis.yml 2016-02-23 13:54:24 +01:00
steckbrief
303a3a1621 Removed useless 'button-message' to load more messages. Implementation already done with a more convenient method 2016-02-23 13:40:24 +01:00
steckbrief
1c983b3b0f Changed access to presences according to new Presence representation in C 2016-02-23 13:12:48 +01:00
steckbrief
cbec38f02d Removed non-existing member variable 2016-02-23 13:11:50 +01:00
steckbrief
e429ba245e Explicit applicationId removed 2016-02-23 13:10:51 +01:00
steckbrief
5a351d9c11 Fix visibility of updateStatusMessages method that LoadMoreMessages can work 2016-02-23 13:10:09 +01:00
steckbrief
ccd352fa86 Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError) 2016-02-23 13:08:51 +01:00
steckbrief
64049eb335 Removed unnecessary dependencies to XmppConnectionService and added allowMessageCorrection to preferences 2016-02-23 13:07:20 +01:00
steckbrief
0c22f68aef merged string resources 2016-02-23 13:02:37 +01:00
Daniel Gultsch
f1c947f0d6 fixed formating in travis config 2016-02-23 11:20:44 +01:00
Daniel Gultsch
9ae997cab8 added remark that users don't need their own app server 2016-02-23 10:15:07 +01:00
Daniel Gultsch
4a9753bebc tell travis to build free version 2016-02-23 09:29:18 +01:00
Daniel Gultsch
5eb2d9af83 update build instructions in readme 2016-02-23 09:07:47 +01:00
Daniel Gultsch
689ded1607 properly trigger show load more messages in mucs 2016-02-22 20:28:58 +01:00
Daniel Gultsch
a0d0ed34ae turned muc errors into enum. added error codes for service shutdown 2016-02-22 20:19:58 +01:00
c5e60b43b8 Merge tag '1.10.0' into trz/merge_1.10.0
Conflicts:
	README.md
	build.gradle
	src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
	src/main/java/eu/siacs/conversations/parser/MessageParser.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/res/layout/activity_edit_account.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-gl/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nb-rNO/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pl/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values-zh-rTW/strings.xml
	src/main/res/values/strings.xml
2016-02-22 14:36:35 +01:00
Daniel Gultsch
c20d8ac69e version bump to 1.10.0 2016-02-21 23:03:30 +01:00
Daniel Gultsch
d2cfac222e show load more messages when auto loading is disabled and messages are still left on server 2016-02-21 17:32:46 +01:00
Daniel Gultsch
b00c561f81 check for uuid change when decrypting pgp messages 2016-02-21 11:43:03 +01:00
Daniel Gultsch
ed740b4868 some mucs may grant voice to visitors in unmoderated rooms 2016-02-21 11:42:41 +01:00
Daniel Gultsch
43b466704a pulled translations from transifex 2016-02-20 10:25:23 +01:00
Daniel Gultsch
3bde4dbedb change uuid when replacing messages 2016-02-20 00:01:39 +01:00
Daniel Gultsch
e6f8b7d9fa decrypt pgp message corrections 2016-02-19 21:02:33 +01:00
Daniel Gultsch
a2cb009f4c skip avatar ui when pep is not available. fixes #1706 2016-02-19 20:54:53 +01:00
Daniel Gultsch
df992d2566 don't reset whisper on reInit. fixes #1637 2016-02-19 20:54:43 +01:00
Daniel Gultsch
ad60bc002c pulled translations from transifex 2016-02-19 11:14:16 +01:00
Daniel Gultsch
49a3f6f281 never parse show in presences as offline 2016-02-19 11:09:28 +01:00
Daniel Gultsch
ac687d6bbd don't log start reason 2016-02-17 16:52:57 +01:00
Daniel Gultsch
59978e157c only offer message correction for the very last message 2016-02-17 16:51:36 +01:00
Daniel Gultsch
3626e4b3a0 fixed regression that caused messages in muc not being send 2016-02-17 16:50:48 +01:00
Daniel Gultsch
c2fbdbde83 log reason why otr message won't be parsed 2016-02-16 14:22:47 +01:00
Daniel Gultsch
86b1865eec fixed regression that caused ui to redraw a lot 2016-02-16 14:22:21 +01:00
Daniel Gultsch
726393f8da version bump to 1.10.0-beta and changelog 2016-02-16 12:59:54 +01:00
Daniel Gultsch
349dd8291d made clear that archiving preferences are server side 2016-02-16 12:52:31 +01:00