aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-07-07 11:52:56 +0300
committerGravatar Vitaly Takmazov2016-07-07 11:52:56 +0300
commit01eada11aafcb712a366ce816c98c660f5ea6907 (patch)
treebe34a296d2a35b24c360a17499c68a028cb88965 /src/main
parent201ed4cdb586c8516d1ec13b90cd615cc030a705 (diff)
parentfbedd4f7784f0cb651cc8105c656a1c20da0e2d5 (diff)
merge core develop
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/juick/Message.java6
-rw-r--r--src/main/java/com/juick/User.java24
2 files changed, 10 insertions, 20 deletions
diff --git a/src/main/java/com/juick/Message.java b/src/main/java/com/juick/Message.java
index 1a690106..c128b4f2 100644
--- a/src/main/java/com/juick/Message.java
+++ b/src/main/java/com/juick/Message.java
@@ -80,6 +80,12 @@ public class Message implements Comparable {
Recommendation = msg.Recommendation;
}
+ public void parseTags(String strTags) {
+ if (strTags != null) {
+ Tags.addAll(Arrays.asList(strTags.split(" ")));
+ }
+ }
+
@Override
public boolean equals(Object obj) {
if (!(obj instanceof Message)) {
diff --git a/src/main/java/com/juick/User.java b/src/main/java/com/juick/User.java
index 13df2058..40a3df96 100644
--- a/src/main/java/com/juick/User.java
+++ b/src/main/java/com/juick/User.java
@@ -28,9 +28,9 @@ public class User {
public Object Avatar = null;
private String FullName = null;
private String JID = null;
- private int unreadCount;
+ public int MessagesCount = 0;
private String AuthHash = null;
- private boolean banned = false;
+ public boolean Banned = false;
public User() {
}
@@ -41,9 +41,9 @@ public class User {
Avatar = u.Avatar;
setFullName(u.getFullName());
setJID(u.getJID());
- setUnreadCount(u.getUnreadCount());
+ MessagesCount = u.MessagesCount;
setAuthHash(u.getAuthHash());
- setBanned(u.isBanned());
+ Banned = u.Banned;
}
@Override
@@ -90,20 +90,4 @@ public class User {
public void setAuthHash(String authHash) {
AuthHash = authHash;
}
-
- public int getUnreadCount() {
- return unreadCount;
- }
-
- public void setUnreadCount(int unreadCount) {
- this.unreadCount = unreadCount;
- }
-
- public boolean isBanned() {
- return banned;
- }
-
- public void setBanned(boolean banned) {
- this.banned = banned;
- }
}