diff options
Diffstat (limited to 'juick-server/src/main/java/com/juick/server')
-rw-r--r-- | juick-server/src/main/java/com/juick/server/UserQueries.java | 2 | ||||
-rw-r--r-- | juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/juick-server/src/main/java/com/juick/server/UserQueries.java b/juick-server/src/main/java/com/juick/server/UserQueries.java index 7400e6b2c..e91cb6b35 100644 --- a/juick-server/src/main/java/com/juick/server/UserQueries.java +++ b/juick-server/src/main/java/com/juick/server/UserQueries.java @@ -152,7 +152,7 @@ public class UserQueries { com.juick.User user = new com.juick.User(); user.setUid(rs.getInt(1)); user.setName(rs.getString(2)); - user.setJID(rs.getString(3)); + user.setJid(rs.getString(3)); return user; }); } diff --git a/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java index 6fa3790ea..eb5797122 100644 --- a/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java +++ b/juick-server/src/main/java/com/juick/server/protocol/JuickProtocol.java @@ -248,16 +248,16 @@ public class JuickProtocol { String retValUpdated; if (input[0].toLowerCase().equals("on")) { newStatus = UserQueries.ActiveStatus.Active; - retValUpdated = "Notifications are activated for " + user.getJID(); + retValUpdated = "Notifications are activated for " + user.getJid(); } else { newStatus = UserQueries.ActiveStatus.Inactive; - retValUpdated = "Notifications are disabled for " + user.getJID(); + retValUpdated = "Notifications are disabled for " + user.getJid(); } - if (UserQueries.setActiveStatusForJID(sql, user.getJID(), newStatus)) { + if (UserQueries.setActiveStatusForJID(sql, user.getJid(), newStatus)) { return new ProtocolReply(retValUpdated, Optional.empty()); } else { - return new ProtocolReply(String.format("Subscriptions status for %s was not changed", user.getJID()), + return new ProtocolReply(String.format("Subscriptions status for %s was not changed", user.getJid()), Optional.empty()); } } |