aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-09-08 23:58:37 +0200
committeriNPUTmice <daniel@gultsch.de>2014-09-08 23:58:37 +0200
commitd92e8381db906c20ceb7f91914d63d514a873c8a (patch)
tree94367a08152e5704eeb4b6b51747919669b46a55 /src/eu/siacs/conversations/parser
parentd9c4637b31c79095d7acff43fee03daa83859ea3 (diff)
setting to increase font size. fixed #420
Diffstat (limited to 'src/eu/siacs/conversations/parser')
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java14
-rw-r--r--src/eu/siacs/conversations/parser/PresenceParser.java3
2 files changed, 9 insertions, 8 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index ed846fe17..bd136a334 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -75,9 +75,8 @@ public class MessageParser extends AbstractParser implements
}
if (!conversation.hasValidOtrSession()) {
if (properlyAddressed) {
- conversation.startOtrSession(
- mXmppConnectionService,
- presence, false);
+ conversation.startOtrSession(mXmppConnectionService, presence,
+ false);
} else {
return null;
}
@@ -87,8 +86,7 @@ public class MessageParser extends AbstractParser implements
if (!foreignPresence.equals(presence)) {
conversation.endOtrIfNeeded();
if (properlyAddressed) {
- conversation.startOtrSession(
- mXmppConnectionService,
+ conversation.startOtrSession(mXmppConnectionService,
presence, false);
} else {
return null;
@@ -289,7 +287,8 @@ public class MessageParser extends AbstractParser implements
if (!conversation.getMucOptions().online()) {
if (x.hasChild("password")) {
Element password = x.findChild("password");
- conversation.getMucOptions().setPassword(password.getContent());
+ conversation.getMucOptions().setPassword(
+ password.getContent());
}
mXmppConnectionService.joinMuc(conversation);
mXmppConnectionService.updateConversationUi();
@@ -453,7 +452,8 @@ public class MessageParser extends AbstractParser implements
Conversation conversation = message.getConversation();
conversation.getMessages().add(message);
if (packet.getType() != MessagePacket.TYPE_ERROR) {
- if (message.getEncryption() == Message.ENCRYPTION_NONE || mXmppConnectionService.saveEncryptedMessages()) {
+ if (message.getEncryption() == Message.ENCRYPTION_NONE
+ || mXmppConnectionService.saveEncryptedMessages()) {
mXmppConnectionService.databaseBackend.createMessage(message);
}
}
diff --git a/src/eu/siacs/conversations/parser/PresenceParser.java b/src/eu/siacs/conversations/parser/PresenceParser.java
index 18c23060d..05ffa67e9 100644
--- a/src/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/eu/siacs/conversations/parser/PresenceParser.java
@@ -107,7 +107,8 @@ public class PresenceParser extends AbstractParser implements
contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
}
}
- Element nick = packet.findChild("nick", "http://jabber.org/protocol/nick");
+ Element nick = packet.findChild("nick",
+ "http://jabber.org/protocol/nick");
if (nick != null) {
contact.setPresenceName(nick.getContent());
}