thedevstack/PiratX
2
0
Fork 0
forked from mirror/monocles_chat_clean
Code Issues 10 Pull requests 1 Wiki Activity Actions 2

only overwrite body in text messages

Browse source 
(cherry picked from commit aaac8296b324e422711e3c5fb315ab8ee81841b0)
This commit is contained in:
Daniel Gultsch 2021-03-19 19:51:13 +01:00 • committed by Christian Schneppe
parent e346c6bb60
commit 081469e171
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -971,6 +971,11 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
return type == TYPE_FILE || type == TYPE_IMAGE || type == TYPE_PRIVATE_FILE;
}
public boolean isTypeText() {
return type == TYPE_TEXT || type == TYPE_PRIVATE;
}
public boolean hasFileOnRemoteHost() {
return isFileOrImage() && getFileParams().url != null;
}

1
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
View file

@ -377,6 +377,7 @@ public class HttpDownloadConnection implements Transferable {
changeStatus(STATUS_OFFER);
} catch (final Exception e) {
Log.d(Config.LOGTAG,"problem downloading",e);
//TODO do not show toast for cancelled stuff
if (interactive) {
showToastForException(e);
} else {

2
src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java
View file

@ -68,7 +68,7 @@ public class ChannelDiscoveryService {
}
void discover(@NonNull final String query, Method method, OnChannelSearchResultsFound onChannelSearchResultsFound) {
List<Room> result = cache.getIfPresent(key(method, query));
final List<Room> result = cache.getIfPresent(key(method, query));
if (result != null) {
onChannelSearchResultsFound.onChannelSearchResultsFound(result);
return;

4
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -4304,7 +4304,9 @@ public class XmppConnectionService extends Service {
if (message.getServerMsgId() == null) {
message.setServerMsgId(serverMessageId);
}
if (message.getEncryption() == Message.ENCRYPTION_NONE && isBodyModified(message, body) && !message.isFileOrImage()) {
if (message.getEncryption() == Message.ENCRYPTION_NONE
&& message.isTypeText()
&& isBodyModified(message, body)) {
message.setBody(body.content);
if (body.count > 1) {
message.setBodyLanguage(body.language);