From 0827b067eca09f0f0f413cfc6efee7119b05a859 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 6 Apr 2017 15:42:12 -0300
Subject: [PATCH] Harmonize position of boolean message variables
---
.../briar/api/client/BaseMessageHeader.java | 14 +++++++-------
.../api/introduction/IntroductionMessage.java | 2 +-
.../briar/api/messaging/PrivateMessageHeader.java | 2 +-
.../briar/api/sharing/InvitationMessage.java | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/client/BaseMessageHeader.java b/briar-api/src/main/java/org/briarproject/briar/api/client/BaseMessageHeader.java
index 4707ba8caa..8cbbceb320 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/client/BaseMessageHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/client/BaseMessageHeader.java
@@ -13,18 +13,18 @@ public abstract class BaseMessageHeader {
private final MessageId id;
private final GroupId groupId;
private final long timestamp;
- private final boolean local, read, sent, seen;
+ private final boolean local, sent, seen, read;
public BaseMessageHeader(MessageId id, GroupId groupId, long timestamp,
- boolean local, boolean read, boolean sent, boolean seen) {
+ boolean local, boolean sent, boolean seen, boolean read) {
this.id = id;
this.groupId = groupId;
this.timestamp = timestamp;
this.local = local;
- this.read = read;
this.sent = sent;
this.seen = seen;
+ this.read = read;
}
public MessageId getId() {
@@ -43,10 +43,6 @@ public abstract class BaseMessageHeader {
return local;
}
- public boolean isRead() {
- return read;
- }
-
public boolean isSent() {
return sent;
}
@@ -55,4 +51,8 @@ public abstract class BaseMessageHeader {
return seen;
}
+ public boolean isRead() {
+ return read;
+ }
+
}
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionMessage.java b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionMessage.java
index 680a955ff1..861469a3a4 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionMessage.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/introduction/IntroductionMessage.java
@@ -22,7 +22,7 @@ public class IntroductionMessage extends BaseMessageHeader {
GroupId groupId, int role, long time, boolean local, boolean sent,
boolean seen, boolean read) {
- super(messageId, groupId, time, local, read, sent, seen);
+ super(messageId, groupId, time, local, sent, seen, read);
this.sessionId = sessionId;
this.messageId = messageId;
this.role = role;
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java
index bc0003177f..9caf3bd560 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/messaging/PrivateMessageHeader.java
@@ -14,7 +14,7 @@ public class PrivateMessageHeader extends BaseMessageHeader {
public PrivateMessageHeader(MessageId id, GroupId groupId, long timestamp,
boolean local, boolean read, boolean sent, boolean seen) {
- super(id, groupId, timestamp, local, read, sent, seen);
+ super(id, groupId, timestamp, local, sent, seen, read);
}
}
diff --git a/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationMessage.java b/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationMessage.java
index 4bdc394559..df93ebdfab 100644
--- a/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationMessage.java
+++ b/briar-api/src/main/java/org/briarproject/briar/api/sharing/InvitationMessage.java
@@ -20,7 +20,7 @@ public class InvitationMessage extends BaseMessageHeader {
boolean local, boolean sent, boolean seen, boolean read,
SessionId sessionId, ContactId contactId) {
- super(id, groupId, time, local, read, sent, seen);
+ super(id, groupId, time, local, sent, seen, read);
this.sessionId = sessionId;
this.contactId = contactId;
}
--
GitLab