From 919c98207bb317e2283084dcbaa34a5216997d85 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Tue, 7 Oct 2014 15:18:09 +0200
Subject: made disabled notifications permanent across restarts

---
 .../siacs/conversations/entities/Conversation.java | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'src/eu/siacs/conversations/entities/Conversation.java')

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index fedb0893..39e54a8f 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -43,6 +43,7 @@ public class Conversation extends AbstractEntity {
 
 	public static final String ATTRIBUTE_NEXT_ENCRYPTION = "next_encryption";
 	public static final String ATTRIBUTE_MUC_PASSWORD = "muc_password";
+	public static final String ATTRIBUTE_MUTED_TILL = "muted_till";
 
 	private String name;
 	private String contactUuid;
@@ -54,8 +55,6 @@ public class Conversation extends AbstractEntity {
 
 	private JSONObject attributes = new JSONObject();
 
-	private long mutedTill = 0;
-
 	private String nextPresence;
 
 	private transient CopyOnWriteArrayList<Message> messages = null;
@@ -452,12 +451,13 @@ public class Conversation extends AbstractEntity {
 		return false;
 	}
 
-	public void setMutedTill(long mutedTill) {
-		this.mutedTill = mutedTill;
+	public void setMutedTill(long value) {
+		this.setAttribute(ATTRIBUTE_MUTED_TILL, String.valueOf(value));
 	}
 
 	public boolean isMuted() {
-		return SystemClock.elapsedRealtime() < this.mutedTill;
+		return SystemClock.elapsedRealtime() < this.getLongAttribute(
+				ATTRIBUTE_MUTED_TILL, 0);
 	}
 
 	public boolean setAttribute(String key, String value) {
@@ -489,4 +489,17 @@ public class Conversation extends AbstractEntity {
 			}
 		}
 	}
+
+	public long getLongAttribute(String key, long defaultValue) {
+		String value = this.getAttribute(key);
+		if (value == null) {
+			return defaultValue;
+		} else {
+			try {
+				return Long.parseLong(value);
+			} catch (NumberFormatException e) {
+				return defaultValue;
+			}
+		}
+	}
 }
-- 
cgit v1.2.3