optimized imports

27 files changed, 57 insertions, 84 deletions

diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiAdapter.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiAdapter.java
index e3dc221da..347870c9d 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiAdapter.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiAdapter.java
@@ -16,11 +16,6 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-
-import java.util.List;
-
 import android.content.Context;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -28,7 +23,11 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
+import java.util.List;
+
+import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
 import github.ankushsachdeva.emojicon.R;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
 
 /**
  * @author Ankush Sachdeva (sankush@yahoo.co.in)
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconEditText.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconEditText.java
index b07528d20..218f8528a 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconEditText.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconEditText.java
@@ -16,13 +16,13 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.widget.EditText;
 
+import github.ankushsachdeva.emojicon.R;
+
 /**
  * @author Hieu Rocker (rockerhieu@gmail.com).
  */
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconGridView.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconGridView.java
index 38df8b13c..10379129c 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconGridView.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconGridView.java
@@ -16,18 +16,17 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-import github.ankushsachdeva.emojicon.emoji.People;
-
-import java.util.Arrays;
-
 import android.app.Activity;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.GridView;
 
+import java.util.Arrays;
+
 import github.ankushsachdeva.emojicon.R;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import github.ankushsachdeva.emojicon.emoji.People;
 
 /**
  * @author Hieu Rocker (rockerhieu@gmail.com)
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconHandler.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconHandler.java
index c84bebb8d..bc7a228c0 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconHandler.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconHandler.java
@@ -15,12 +15,12 @@
  */
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.R;
-
 import android.content.Context;
 import android.text.Spannable;
 import android.util.SparseIntArray;
 
+import github.ankushsachdeva.emojicon.R;
+
 /**
  * @author Hieu Rocker (rockerhieu@gmail.com)
  */
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecents.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecents.java
index 195c86aba..c7a90c837 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecents.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecents.java
@@ -16,10 +16,10 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-
 import android.content.Context;
 
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+
 /**
 * @author Daniele Ricci
 */
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
index 2aecbb59d..ea98c809d 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
@@ -16,11 +16,11 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
 import android.content.Context;
 import android.widget.GridView;
 
 import github.ankushsachdeva.emojicon.R;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
 
 /**
  * @author Daniele Ricci
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
index 9fbb987e5..177f11591 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
@@ -16,13 +16,13 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import android.content.Context;
+import android.content.SharedPreferences;
 
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
-import android.content.Context;
-import android.content.SharedPreferences;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
 
 
 /**
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconTextView.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconTextView.java
index 5822e4780..0c63f1788 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconTextView.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconTextView.java
@@ -16,14 +16,14 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.text.SpannableStringBuilder;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
+import github.ankushsachdeva.emojicon.R;
+
 /**
  * @author Hieu Rocker (rockerhieu@gmail.com).
  */
diff --git a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconsPopup.java b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconsPopup.java
index d328efc76..2a35aa9c0 100644
--- a/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconsPopup.java
+++ b/libs/emojicon/src/github/ankushsachdeva/emojicon/EmojiconsPopup.java
@@ -16,17 +16,6 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-import github.ankushsachdeva.emojicon.emoji.Nature;
-import github.ankushsachdeva.emojicon.emoji.Objects;
-import github.ankushsachdeva.emojicon.emoji.People;
-import github.ankushsachdeva.emojicon.emoji.Places;
-import github.ankushsachdeva.emojicon.emoji.Symbols;
-
-import java.util.Arrays;
-import java.util.List;
-
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
@@ -47,6 +36,17 @@ import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
 import android.widget.PopupWindow;
 
+import java.util.Arrays;
+import java.util.List;
+
+import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import github.ankushsachdeva.emojicon.emoji.Nature;
+import github.ankushsachdeva.emojicon.emoji.Objects;
+import github.ankushsachdeva.emojicon.emoji.People;
+import github.ankushsachdeva.emojicon.emoji.Places;
+import github.ankushsachdeva.emojicon.emoji.Symbols;
+
 
 /**
  * @author Ankush Sachdeva (sankush@yahoo.co.in).
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiAdapter.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiAdapter.java
index e3dc221da..e33d8d6b9 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiAdapter.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiAdapter.java
@@ -16,11 +16,6 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-
-import java.util.List;
-
 import android.content.Context;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -28,7 +23,10 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import github.ankushsachdeva.emojicon.R;
+import java.util.List;
+
+import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
 
 /**
  * @author Ankush Sachdeva (sankush@yahoo.co.in)
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconEditText.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconEditText.java
index b07528d20..b60d985ca 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconEditText.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconEditText.java
@@ -16,8 +16,6 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGridView.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGridView.java
index 38df8b13c..1f2c6bb46 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGridView.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGridView.java
@@ -16,18 +16,16 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-import github.ankushsachdeva.emojicon.emoji.People;
-
-import java.util.Arrays;
-
 import android.app.Activity;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.GridView;
 
-import github.ankushsachdeva.emojicon.R;
+import java.util.Arrays;
+
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import github.ankushsachdeva.emojicon.emoji.People;
 
 /**
  * @author Hieu Rocker (rockerhieu@gmail.com)
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
index c84bebb8d..8fac5385b 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
@@ -15,8 +15,6 @@
  */
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.R;
-
 import android.content.Context;
 import android.text.Spannable;
 import android.util.SparseIntArray;
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecents.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecents.java
index 195c86aba..c7a90c837 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecents.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecents.java
@@ -16,10 +16,10 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-
 import android.content.Context;
 
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+
 /**
 * @author Daniele Ricci
 */
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
index 2aecbb59d..d4f2211e7 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
@@ -16,11 +16,10 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
 import android.content.Context;
 import android.widget.GridView;
 
-import github.ankushsachdeva.emojicon.R;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
 
 /**
  * @author Daniele Ricci
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
index 9fbb987e5..177f11591 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
@@ -16,13 +16,13 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import android.content.Context;
+import android.content.SharedPreferences;
 
 import java.util.ArrayList;
 import java.util.StringTokenizer;
 
-import android.content.Context;
-import android.content.SharedPreferences;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
 
 
 /**
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
index 5822e4780..063da24dc 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
@@ -16,8 +16,6 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.text.SpannableStringBuilder;
diff --git a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconsPopup.java b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconsPopup.java
index d328efc76..2a35aa9c0 100644
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconsPopup.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconsPopup.java
@@ -16,17 +16,6 @@
 
 package github.ankushsachdeva.emojicon;
 
-import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-import github.ankushsachdeva.emojicon.emoji.Nature;
-import github.ankushsachdeva.emojicon.emoji.Objects;
-import github.ankushsachdeva.emojicon.emoji.People;
-import github.ankushsachdeva.emojicon.emoji.Places;
-import github.ankushsachdeva.emojicon.emoji.Symbols;
-
-import java.util.Arrays;
-import java.util.List;
-
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Rect;
@@ -47,6 +36,17 @@ import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
 import android.widget.PopupWindow;
 
+import java.util.Arrays;
+import java.util.List;
+
+import github.ankushsachdeva.emojicon.EmojiconGridView.OnEmojiconClickedListener;
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import github.ankushsachdeva.emojicon.emoji.Nature;
+import github.ankushsachdeva.emojicon.emoji.Objects;
+import github.ankushsachdeva.emojicon.emoji.People;
+import github.ankushsachdeva.emojicon.emoji.Places;
+import github.ankushsachdeva.emojicon.emoji.Symbols;
+
 
 /**
  * @author Ankush Sachdeva (sankush@yahoo.co.in).
diff --git a/src/main/java/de/pixart/messenger/entities/Presences.java b/src/main/java/de/pixart/messenger/entities/Presences.java
index 3f1ce639a..98ea58fcf 100644
--- a/src/main/java/de/pixart/messenger/entities/Presences.java
+++ b/src/main/java/de/pixart/messenger/entities/Presences.java
@@ -3,7 +3,6 @@ package de.pixart.messenger.entities;
 import android.util.Pair;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index 358fc0db1..cb586b935 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -10,12 +10,10 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.RectF;
-import android.media.ExifInterface;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.os.FileObserver;
 import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index e22426b9e..38cb67b2a 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -64,7 +64,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutionException;
 
 import de.duenndns.ssl.MemorizingTrustManager;
 import de.pixart.messenger.Config;
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index b65fa5bcb..8e596303b 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -84,8 +84,6 @@ import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
 import de.timroes.android.listview.EnhancedListView;
 
-import static de.pixart.messenger.crypto.axolotl.AxolotlService.AxolotlCapability.MISSING_PRESENCE;
-
 public class ConversationActivity extends XmppActivity
 	implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, View.OnClickListener {
 
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index ba093267f..828e4516e 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -43,7 +43,6 @@ import java.util.UUID;
 
 import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
-import de.pixart.messenger.crypto.axolotl.AxolotlService;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index ce0b34068..3c04b0818 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -25,7 +25,6 @@ import android.nfc.NfcAdapter;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.text.Editable;
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index ed1199dff..48d52a44b 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -69,7 +69,6 @@ import java.io.FileNotFoundException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
@@ -91,13 +90,11 @@ import de.pixart.messenger.services.XmppConnectionService.XmppConnectionBinder;
 import de.pixart.messenger.ui.widget.Switch;
 import de.pixart.messenger.utils.CryptoHelper;
 import de.pixart.messenger.utils.ExceptionHelper;
+import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xmpp.OnKeyStatusUpdated;
 import de.pixart.messenger.xmpp.OnUpdateBlocklist;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
-import de.pixart.messenger.entities.Presence;
-import de.pixart.messenger.entities.ServiceDiscoveryResult;
-import de.pixart.messenger.utils.UIHelper;
 
 public abstract class XmppActivity extends Activity {
 
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
index cea0cc67f..691b901db 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
@@ -13,7 +13,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.wefika.flowlayout.FlowLayout;
diff --git a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
index 77ec83aad..0ab9ba5ac 100644
--- a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
+++ b/src/playstore/java/de/pixart/messenger/services/PushManagementService.java
@@ -8,8 +8,6 @@ import com.google.android.gms.common.GoogleApiAvailability;
 import com.google.android.gms.gcm.GoogleCloudMessaging;
 import com.google.android.gms.iid.InstanceID;
 
-import java.io.IOException;
-
 import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;