1 files changed, 25 insertions, 26 deletions

diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java
index eacd172c..80a9d62f 100644
--- a/src/eu/siacs/conversations/entities/Account.java
+++ b/src/eu/siacs/conversations/entities/Account.java
@@ -11,16 +11,14 @@ import net.java.otr4j.crypto.OtrCryptoException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.OtrEngine;
-import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.XmppConnection;
 import android.content.ContentValues;
-import android.content.Context;
 import android.database.Cursor;
-import android.graphics.Bitmap;
+import android.os.SystemClock;
 
 public class Account extends AbstractEntity {
 
@@ -64,16 +62,14 @@ public class Account extends AbstractEntity {
 
 	protected boolean online = false;
 
-	transient OtrEngine otrEngine = null;
-	transient XmppConnection xmppConnection = null;
-	transient protected Presences presences = new Presences();
-
+	private OtrEngine otrEngine = null;
+	private XmppConnection xmppConnection = null;
+	private Presences presences = new Presences();
+	private long mEndGracePeriod = 0L;
 	private String otrFingerprint;
-
 	private Roster roster = null;
 
 	private List<Bookmark> bookmarks = new CopyOnWriteArrayList<Bookmark>();
-
 	public List<Conversation> pendingConferenceJoins = new CopyOnWriteArrayList<Conversation>();
 	public List<Conversation> pendingConferenceLeaves = new CopyOnWriteArrayList<Conversation>();
 
@@ -160,8 +156,12 @@ public class Account extends AbstractEntity {
 	}
 
 	public boolean hasErrorStatus() {
-		return getStatus() > STATUS_NO_INTERNET
-				&& (getXmppConnection().getAttempt() >= 2);
+		if (getXmppConnection() == null) {
+			return false;
+		} else {
+			return getStatus() > STATUS_NO_INTERNET
+					&& (getXmppConnection().getAttempt() >= 2);
+		}
 	}
 
 	public void setResource(String resource) {
@@ -341,20 +341,6 @@ public class Account extends AbstractEntity {
 		return false;
 	}
 
-	public Bitmap getImage(Context context, int size) {
-		if (this.avatar != null) {
-			Bitmap bm = FileBackend.getAvatar(this.avatar, size, context);
-			if (bm == null) {
-				return UIHelper.getContactPicture(getJid(), size, context,
-						false);
-			} else {
-				return bm;
-			}
-		} else {
-			return UIHelper.getContactPicture(getJid(), size, context, false);
-		}
-	}
-
 	public boolean setAvatar(String filename) {
 		if (this.avatar != null && this.avatar.equals(filename)) {
 			return false;
@@ -397,4 +383,17 @@ public class Account extends AbstractEntity {
 			return R.string.account_status_unknown;
 		}
 	}
+
+	public void activateGracePeriod() {
+		this.mEndGracePeriod = SystemClock.elapsedRealtime()
+				+ (Config.CARBON_GRACE_PERIOD * 1000);
+	}
+
+	public void deactivateGracePeriod() {
+		this.mEndGracePeriod = 0L;
+	}
+
+	public boolean inGracePeriod() {
+		return SystemClock.elapsedRealtime() < this.mEndGracePeriod;
+	}
 }