aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/entities
diff options
context:
space:
mode:
Diffstat (limited to 'src/eu/siacs/conversations/entities')
-rw-r--r--src/eu/siacs/conversations/entities/Message.java10
-rw-r--r--src/eu/siacs/conversations/entities/MucOptions.java18
2 files changed, 15 insertions, 13 deletions
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java
index 5cbd68dd..ce496d27 100644
--- a/src/eu/siacs/conversations/entities/Message.java
+++ b/src/eu/siacs/conversations/entities/Message.java
@@ -149,9 +149,11 @@ public class Message extends AbstractEntity {
public String getReadableBody(Context context) {
if ((encryption == ENCRYPTION_PGP) && (type == TYPE_TEXT)) {
- return context.getText(R.string.encrypted_message_received).toString();
+ return context.getText(R.string.encrypted_message_received)
+ .toString();
} else if ((encryption == ENCRYPTION_OTR) && (type == TYPE_IMAGE)) {
- return context.getText(R.string.encrypted_image_received).toString();
+ return context.getText(R.string.encrypted_image_received)
+ .toString();
} else if (encryption == ENCRYPTION_DECRYPTION_FAILED) {
return context.getText(R.string.decryption_failed).toString();
} else if (type == TYPE_IMAGE) {
@@ -339,7 +341,7 @@ public class Message extends AbstractEntity {
}
return body.trim();
}
-
+
public int getMergedStatus() {
Message next = this.next();
if (this.mergable(next)) {
@@ -348,7 +350,7 @@ public class Message extends AbstractEntity {
return getStatus();
}
}
-
+
public long getMergedTimeSent() {
Message next = this.next();
if (this.mergable(next)) {
diff --git a/src/eu/siacs/conversations/entities/MucOptions.java b/src/eu/siacs/conversations/entities/MucOptions.java
index 3988eae0..e9ab6908 100644
--- a/src/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/eu/siacs/conversations/entities/MucOptions.java
@@ -158,8 +158,8 @@ public class MucOptions {
}
aboutToRename = false;
}
- if (conversation.getBookmark() != null &&
- conversation.getBookmark().isProvidePassword()) {
+ if (conversation.getBookmark() != null
+ && conversation.getBookmark().isProvidePassword()) {
this.passwordChanged = false;
}
} else {
@@ -194,8 +194,8 @@ public class MucOptions {
this.error = ERROR_NICK_IN_USE;
}
} else if (error.hasChild("not-authorized")) {
- if (conversation.getBookmark() != null &&
- conversation.getBookmark().isProvidePassword()) {
+ if (conversation.getBookmark() != null
+ && conversation.getBookmark().isProvidePassword()) {
this.passwordChanged = true;
}
this.error = ERROR_PASSWORD_REQUIRED;
@@ -323,17 +323,17 @@ public class MucOptions {
}
public String getPassword() {
- if (conversation.getBookmark() != null &&
- conversation.getBookmark().getPassword() != null) {
+ if (conversation.getBookmark() != null
+ && conversation.getBookmark().getPassword() != null) {
return conversation.getBookmark().getPassword();
} else {
return this.password;
}
}
-
+
public void setPassword(String password) {
- if (conversation.getBookmark() != null &&
- conversation.getBookmark().isProvidePassword()) {
+ if (conversation.getBookmark() != null
+ && conversation.getBookmark().isProvidePassword()) {
conversation.getBookmark().setPassword(password);
} else {
this.password = password;