From a76de90fe7a53220e9358d38fa7b47b63f7694fe Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Thu, 13 Aug 2015 16:15:14 +0200
Subject: resolve of some compiler errors

---
 src/main/java/de/thedevstack/conversationsplus/entities/Account.java    | 2 +-
 .../thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java   | 1 +
 src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
index 530adf06..b620887e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java
@@ -19,7 +19,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
-import de.thedevstack.conversationsplus.crypto.OtrEngine;
+import de.thedevstack.conversationsplus.crypto.OtrService;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.xmpp.XmppConnection;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
index 123ae9a9..c9698114 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -3,6 +3,7 @@ package de.thedevstack.conversationsplus.ui.adapter;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
index 0e7833e4..a66b1bf8 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
@@ -6,6 +6,7 @@ import java.net.URLConnection;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
-- 
cgit v1.2.3