aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-13 16:15:14 +0200
committerlookshe <github@lookshe.org>2015-08-13 16:15:14 +0200
commita76de90fe7a53220e9358d38fa7b47b63f7694fe (patch)
treea6e6701f03e5e01188a0e6717d1fcb8e5c0eba07 /src/main
parenta9279c2001cd459964381e715d7186285a32c50a (diff)
resolve of some compiler errors
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/entities/Account.java2
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java1
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java1
3 files changed, 3 insertions, 1 deletions
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;