Moved logcat to a module, increased error robustness for loading last messages

35 files changed, 150 insertions, 67 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/Logging.java b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/Logging.java
index 40ec66a0..6af7a70e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/Logging.java
+++ b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/Logging.java
@@ -1,12 +1,36 @@
-package de.thedevstack.conversationsplus.utils;
+package de.thedevstack.android.logcat;
 
 import android.util.Log;
 
 /**
- * Created by tzur on 20.11.2015.
+ * Utility class to prefix every log tag.
+ * This can be used for better filtering in the log cat output activity.
  */
 public class Logging {
-    protected static final String LOG_TAG_PREFIX = "thedevstack.";
+    /**
+     * The prefix for every log tag.
+     */
+    protected static String LOG_TAG_PREFIX = "thedevstack.";
+
+    /**
+     * Changes the default log tag prefix.
+     * The default value is <code>thedevstack.</code>
+     * @param logTagPrefix the new log tag prefix to use
+     */
+    public static void initLogTagPrefix(String logTagPrefix) {
+        if (null != logTagPrefix) {
+            LOG_TAG_PREFIX = logTagPrefix;
+        }
+    }
+
+    /**
+     * Returns the current log tag prefix.
+     * @return value of Logging.LOG_TAG_PREFIX
+     */
+    public static String getLogTagPrefix() {
+        return LOG_TAG_PREFIX;
+    }
+
     /**
      * Send a {@link Log#VERBOSE} log message.
      * @param tag Used to identify the source of a log message.  It usually identifies
diff --git a/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java
index c8a96ea3..c8a96ea3 100644
--- a/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java
+++ b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java
diff --git a/src/main/java/de/thedevstack/android/logcat/tasks/ReadLogCatAsyncTask.java b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/tasks/ReadLogCatAsyncTask.java
index b9fa450b..1136faf8 100644
--- a/src/main/java/de/thedevstack/android/logcat/tasks/ReadLogCatAsyncTask.java
+++ b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/tasks/ReadLogCatAsyncTask.java
@@ -1,7 +1,6 @@
 package de.thedevstack.android.logcat.tasks;
 
 import android.os.AsyncTask;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.widget.ArrayAdapter;
 
 import java.io.BufferedReader;
@@ -9,20 +8,46 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 
-import de.thedevstack.conversationsplus.utils.StreamUtil;
+import de.thedevstack.android.logcat.Logging;
 
 /**
- * Created by tzur on 20.11.2015.
+ * Task to read the logcat of the App.
+ * The command <code>logcat -d -v time</code> is used to load the logs.
+ * This reader uses a white list to restrict the messages to display, otherwise it might be flooded with useless log messages.
+ * The white list checks if a log messages contains one of the following strings:
+ * <ul>
+ *     <li>{@value Logging#LOG_TAG_PREFIX}</li>
+ *     <li><code>E/</code> - for every error message</li>
+ *     <li><code>W/</code> - for every warning message</li>
+ * </ul>
  */
 public class ReadLogCatAsyncTask extends AsyncTask<Void, Void, String[]> {
+    /**
+     * The array adapter to publish the log messages to.
+     */
     private final ArrayAdapter<String> arrayAdapter;
+    /**
+     * The command to execute logcat.
+     */
     private static final String[] LOG_CAT_CMD = { "logcat", "-d", "-v", "time"};
-    private static final String[] WHITE_LIST = { "thedevstack.", "E/", "W/" };
-    private static final String[] BLACK_LIST = { "D/TextLayoutCache" };
+    /**
+     * The white list to filter log messages.
+     */
+    private static final String[] WHITE_LIST = { Logging.getLogTagPrefix(), "E/", "W/" };
 
+    /**
+     * Initializes the Task with the array adapter to publish the log messages to.
+     * @param arrayAdapter the array adapter
+     */
     public ReadLogCatAsyncTask(ArrayAdapter<String> arrayAdapter) {
         this.arrayAdapter = arrayAdapter;
     }
+
+    /**
+     * Executes the logcat command, reads the output of the command and returns all log messages.
+     * @param params no params will be passed. (interface compliance)
+     * @return the array of log messages
+     */
     @Override
     protected String[] doInBackground(Void... params) {
         ArrayList<String> logCatOutput = new ArrayList<>();
@@ -34,16 +59,24 @@ public class ReadLogCatAsyncTask extends AsyncTask<Void, Void, String[]> {
             while ((line = bufferedReader.readLine()) != null) {
                 logCatOutput.add(line);
             }
-            bufferedReader.close();
         } catch (IOException e) {
             Logging.e("ReadLogCat", "error while retrieving information from logcat: " + e.getMessage(), e);
         } finally {
-            StreamUtil.close(bufferedReader);
+            if (null != bufferedReader) {
+                try {
+                    bufferedReader.close();
+                } catch (IOException e) {
+                }
+            }
         }
         logCatOutput.trimToSize();
         return logCatOutput.toArray(new String[0]);
     }
 
+    /**
+     * Clears the array adapter and adds the filtered log messages.
+     * @param items all log messages
+     */
     @Override
     protected void onPostExecute(String[] items) {
         this.arrayAdapter.clear();
@@ -56,6 +89,11 @@ public class ReadLogCatAsyncTask extends AsyncTask<Void, Void, String[]> {
         }
     }
 
+    /**
+     * Checks whether a log message contains a white listed string or not.
+     * @param item the item to filter
+     * @return <code>true</code> if the string should be filtered (removed from the list) <code>false</code> otherwise.
+     */
     protected boolean filter(String item) {
         for (String whiteListed : ReadLogCatAsyncTask.WHITE_LIST) {
             if (item.contains(whiteListed)) {
diff --git a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
index da82fc7f..6568a2c5 100644
--- a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
+++ b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
@@ -9,8 +9,6 @@ import android.widget.Toast;
 import java.util.ArrayList;
 
 import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
-import de.thedevstack.conversationsplus.ConversationsPlusApplication;
-import de.thedevstack.conversationsplus.R;
 
 /**
  * Created by tzur on 20.11.2015.
@@ -18,10 +16,12 @@ import de.thedevstack.conversationsplus.R;
 public class LogCatOutputCopyOnClickListener implements View.OnClickListener {
     private final LogCatArrayAdapter logCatOutputAdapter;
     private final Context context;
+    private final int resIdForToast;
 
-    public LogCatOutputCopyOnClickListener(Context context, LogCatArrayAdapter logCatOutputAdapter) {
+    public LogCatOutputCopyOnClickListener(Context context, LogCatArrayAdapter logCatOutputAdapter, int resIdForToast) {
         this.logCatOutputAdapter = logCatOutputAdapter;
         this.context = context;
+        this.resIdForToast = resIdForToast;
     }
 
     @Override
@@ -33,10 +33,10 @@ public class LogCatOutputCopyOnClickListener implements View.OnClickListener {
                 sb.append(item);
                 sb.append("\n");
             }
-            ClipboardManager clipboard = (ClipboardManager) ConversationsPlusApplication.getInstance().getSystemService(Context.CLIPBOARD_SERVICE);
+            ClipboardManager clipboard = (ClipboardManager) this.context.getSystemService(Context.CLIPBOARD_SERVICE);
             ClipData clip = ClipData.newPlainText("c+logcat", sb.toString());
             clipboard.setPrimaryClip(clip);
-            Toast.makeText(this.context, R.string.cplus_copied_to_clipboard, Toast.LENGTH_LONG).show();
+            Toast.makeText(this.context, this.context.getText(this.resIdForToast), Toast.LENGTH_LONG).show();
         }
     }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java b/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java
index 11091c9f..e70e8e43 100644
--- a/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java
@@ -14,7 +14,7 @@ import java.security.spec.InvalidKeySpecException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.thedevstack.conversationsplus.utils.Logging;
+import de.thedevstack.android.logcat.Logging;
 
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
index 8d608ae7..4031e546 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
@@ -19,11 +19,10 @@ import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.utils.MimeUtils;
 
-import de.thedevstack.conversationsplus.utils.Logging;
-
 public class DownloadableFile extends File {
 
 	private static final long serialVersionUID = 2247012619505115863L;
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
index c0a169ee..c76ed6d7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
@@ -3,7 +3,6 @@ package de.thedevstack.conversationsplus.http;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemClock;
-import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -16,6 +15,7 @@ import java.util.Arrays;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLHandshakeException;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
index 3d12681f..d5d7ad02 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java
@@ -1,7 +1,6 @@
 package de.thedevstack.conversationsplus.http;
 
 import android.app.PendingIntent;
-import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,6 +11,7 @@ import java.net.URL;
 
 import javax.net.ssl.HttpsURLConnection;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Transferable;
diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
index 88091366..9df70c1e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java
@@ -1,10 +1,9 @@
 package de.thedevstack.conversationsplus.parser;
 
-import de.thedevstack.conversationsplus.utils.Logging;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index 6f8ad2fe..721f1a23 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -1,11 +1,11 @@
 package de.thedevstack.conversationsplus.parser;
 
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.util.Pair;
 
 import net.java.otr4j.session.Session;
 import net.java.otr4j.session.SessionStatus;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
index cfd00b1b..5b09fe2e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
@@ -18,7 +19,6 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteCantOpenDatabaseException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import de.thedevstack.conversationsplus.utils.Logging;
 
 public class DatabaseBackend extends SQLiteOpenHelper {
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
index 5cc63065..d442abe2 100644
--- a/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
@@ -16,9 +16,9 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Environment;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.webkit.MimeTypeMap;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.R;
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java b/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
index ec1d5da1..1e0abec1 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java
@@ -1,13 +1,12 @@
 package de.thedevstack.conversationsplus.services;
 
-import de.thedevstack.conversationsplus.utils.Logging;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index 30fae7cc..159fcf44 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -21,7 +21,6 @@ import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
 import android.provider.ContactsContract;
-import de.thedevstack.conversationsplus.utils.Logging;
 
 import net.java.otr4j.OtrException;
 import net.java.otr4j.session.Session;
@@ -50,6 +49,8 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import de.duenndns.ssl.MemorizingTrustManager;
+
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
diff --git a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
index bb49c54d..e75c1f63 100644
--- a/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
@@ -1,4 +1,4 @@
-package de.thedevstack.android.logcat.ui;
+package de.thedevstack.conversationsplus.ui;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -7,6 +7,7 @@ import android.widget.ListView;
 
 import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
 import de.thedevstack.android.logcat.tasks.ReadLogCatAsyncTask;
+import de.thedevstack.android.logcat.ui.LogCatOutputCopyOnClickListener;
 import de.thedevstack.conversationsplus.R;
 
 /**
@@ -22,6 +23,6 @@ public class LogCatOutputActivity extends Activity {
         lv.setAdapter(logCatOutputAdapter);
         new ReadLogCatAsyncTask(logCatOutputAdapter).execute();
         Button copyButton = (Button) findViewById(R.id.actLogOutputCopyButton);
-        copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter));
+        copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter, R.string.cplus_copied_to_clipboard));
     }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
index 6a5d47c2..8ad23e6e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
@@ -24,7 +24,6 @@ import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.text.Editable;
 import android.text.TextWatcher;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
@@ -52,6 +51,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
index 312c4223..23278bfb 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
@@ -37,7 +37,6 @@ import android.os.IBinder;
 import android.os.SystemClock;
 import android.text.InputType;
 import android.util.DisplayMetrics;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -62,6 +61,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
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 abb77993..4e361c67 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -8,7 +8,6 @@ import android.graphics.Typeface;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -21,6 +20,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
 import de.tzur.conversations.Settings;
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index a6ee21e6..56297f6c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -2,12 +2,12 @@ package de.thedevstack.conversationsplus.ui.dialogs;
 
 import android.app.Activity;
 import android.text.format.DateFormat;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.view.View;
 import android.widget.TextView;
 
 import java.util.Date;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
index bd616691..30b7bf73 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
@@ -1,8 +1,5 @@
 package de.thedevstack.conversationsplus.ui.listeners;
 
-import de.thedevstack.conversationsplus.R;
-import de.thedevstack.conversationsplus.services.MessageArchiveService;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.widget.ListView;
 
 import com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout;
@@ -10,6 +7,10 @@ import com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayoutD
 
 import java.util.List;
 
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.R;
+import de.thedevstack.conversationsplus.entities.Conversation;
+import de.thedevstack.conversationsplus.services.MessageArchiveService;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.ui.ConversationActivity;
@@ -36,7 +37,7 @@ public class ConversationSwipeRefreshListener implements SwipyRefreshLayout.OnRe
         Logging.d(Config.LOGTAG, "Refresh direction " + direction);
         synchronized (this.messageList) {
             long timestamp;
-            if (SwipyRefreshLayoutDirection.TOP == direction) {
+            if (SwipyRefreshLayoutDirection.TOP == direction) { // Load history -> messages sent/received before first message in database
                 if (messageList.isEmpty()) {
                     timestamp = System.currentTimeMillis();
                 } else {
@@ -45,28 +46,47 @@ public class ConversationSwipeRefreshListener implements SwipyRefreshLayout.OnRe
                 ConversationActivity activity = (ConversationActivity) fragment.getActivity();
                 this.listener.setLoadHistory(true);
                 activity.xmppConnectionService.loadMoreMessages(activity.getSelectedConversation(), timestamp, this.listener);
-            } else if (SwipyRefreshLayoutDirection.BOTTOM == direction) {
+            } else if (SwipyRefreshLayoutDirection.BOTTOM == direction) { // load messages sent/received between last received or last session establishment and now
                 Logging.d("mam", "loading missing messages from mam (last session establishing or last received message)");
                 final ConversationActivity activity = (ConversationActivity) fragment.getActivity();
-                long lastSessionEstablished = activity.getSelectedConversation().getAccount().getXmppConnection().getLastSessionEstablished();
-                int lastMessageIndex = this.messageList.size() - 1;
-                long lastReceivedMessage = (0 <= lastMessageIndex) ? this.messageList.get(lastMessageIndex).getTimeSent() : Long.MAX_VALUE;
+                long lastSessionEstablished = this.getTimestampOfLastSessionEstablished(activity.getSelectedConversation());
+                long lastReceivedMessage = this.getTimestampOfLastReceivedOrTransmittedMessage();
                 long startTimestamp = Math.min(lastSessionEstablished, lastReceivedMessage);
                 MessageArchiveService.Query query = activity.xmppConnectionService.getMessageArchiveService().query(activity.getSelectedConversation(), startTimestamp, System.currentTimeMillis());
                 if (query != null) {
                     this.listener.setLoadHistory(false);
                     query.setCallback(this.listener);
                 } else {
-                    activity.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            listener.onMoreMessagesLoaded(0, activity.getSelectedConversation());
-                        }
-                    });
+                    Logging.d("mam", "no query built - no messages loaded");
+                    this.listener.onMoreMessagesLoaded(0, activity.getSelectedConversation());
+                    this.listener.informUser(R.string.no_more_history_on_server);
                 }
                 this.listener.informUser(R.string.fetching_history_from_server);
             }
         }
         Logging.d(Config.LOGTAG, "End Refresh swipe container");
     }
+
+    private long getTimestampOfLastReceivedOrTransmittedMessage() {
+        long lastReceivedOrTransmittedMessage = Long.MAX_VALUE;
+        if (null != this.messageList
+                && !this.messageList.isEmpty()) {
+            int lastMessageIndex = this.messageList.size() - 1;
+            if (0 <= lastMessageIndex && this.messageList.size() > lastMessageIndex) {
+                lastReceivedOrTransmittedMessage = this.messageList.get(lastMessageIndex).getTimeSent();
+            }
+        }
+
+        return lastReceivedOrTransmittedMessage;
+    }
+
+    private long getTimestampOfLastSessionEstablished(Conversation conversation) {
+        long lastSessionEstablished = Long.MAX_VALUE;
+        if (null != conversation
+                && null != conversation.getAccount()
+                && null != conversation.getAccount().getXmppConnection()) {
+            lastSessionEstablished = conversation.getAccount().getXmppConnection().getLastSessionEstablished();
+        }
+        return lastSessionEstablished;
+    }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/preferences/LogInformationPreference.java b/src/main/java/de/thedevstack/conversationsplus/ui/preferences/LogInformationPreference.java
index 65b3b1b3..5dcfc607 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/preferences/LogInformationPreference.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/preferences/LogInformationPreference.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.preference.Preference;
 import android.util.AttributeSet;
 
-import de.thedevstack.android.logcat.ui.LogCatOutputActivity;
+import de.thedevstack.conversationsplus.ui.LogCatOutputActivity;
 
 /**
  * Created by tzur on 07.10.2015.
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
index 87b9eb32..660100a3 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
@@ -4,7 +4,6 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.util.Base64;
 import android.util.Base64OutputStream;
-import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -16,6 +15,7 @@ import java.security.DigestOutputStream;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java
index bd7a6623..aa16b06b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java
@@ -10,8 +10,6 @@ import de.measite.minidns.record.A;
 import de.measite.minidns.record.AAAA;
 import de.measite.minidns.record.Data;
 import de.measite.minidns.util.NameUtil;
-import de.thedevstack.conversationsplus.Config;
-import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -23,7 +21,10 @@ import java.util.TreeMap;
 import java.util.regex.Pattern;
 
 import android.os.Bundle;
-import de.thedevstack.conversationsplus.utils.Logging;
+
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 
 public class DNSHelper {
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java
index dc8ca40d..32f45127 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java
@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.List;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
@@ -26,7 +27,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.preference.PreferenceManager;
 import android.text.format.DateUtils;
-import de.thedevstack.conversationsplus.utils.Logging;
 
 public class ExceptionHelper {
 	public static void init(Context context) {
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java
index 7aaf8b0b..576698ce 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java
@@ -16,7 +16,7 @@
 
 package de.thedevstack.conversationsplus.utils;
 
-import de.thedevstack.conversationsplus.utils.Logging;
+import de.thedevstack.android.logcat.Logging;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java
index 1d126db5..7e8cacd0 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java
@@ -7,7 +7,6 @@ import android.graphics.Matrix;
 import android.graphics.RectF;
 import android.media.ExifInterface;
 import android.net.Uri;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.util.LruCache;
 
 import java.io.File;
@@ -15,6 +14,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.entities.Message;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java b/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java
index ca4d65ff..0751809c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java
@@ -2,7 +2,6 @@ package de.thedevstack.conversationsplus.utils;
 
 import android.os.Build;
 import android.os.Process;
-import de.thedevstack.conversationsplus.utils.Logging;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -19,6 +18,8 @@ import java.security.SecureRandom;
 import java.security.SecureRandomSpi;
 import java.security.Security;
 
+import de.thedevstack.android.logcat.Logging;
+
 /**
  * Fixes for the output of the default PRNG having low entropy.
  * 
diff --git a/src/main/java/de/thedevstack/conversationsplus/xml/Element.java b/src/main/java/de/thedevstack/conversationsplus/xml/Element.java
index 88b20e14..3d2c75b0 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xml/Element.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xml/Element.java
@@ -1,11 +1,10 @@
 package de.thedevstack.conversationsplus.xml;
 
-import de.thedevstack.conversationsplus.utils.Logging;
-
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.utils.XmlHelper;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
diff --git a/src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java b/src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java
index 2eea0571..35425816 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java
@@ -7,11 +7,11 @@ import java.io.InputStreamReader;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.util.Xml;
 
 public class XmlReader {
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
index 2b084d4b..37137eb3 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java
@@ -6,7 +6,6 @@ import android.os.Parcelable;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
-import de.thedevstack.conversationsplus.utils.Logging;
 import android.util.Pair;
 import android.util.SparseArray;
 
@@ -43,6 +42,7 @@ import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.crypto.sasl.DigestMd5;
 import de.thedevstack.conversationsplus.crypto.sasl.Plain;
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
index e3a599d7..6ddf99b8 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
@@ -11,7 +11,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemClock;
-import de.thedevstack.conversationsplus.utils.Logging;
+
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.entities.Account;
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
index f10d7c7e..861082d8 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
@@ -6,7 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import android.annotation.SuppressLint;
-import de.thedevstack.conversationsplus.utils.Logging;
+
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Transferable;
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
index db22f8c3..84d40b3e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
@@ -8,8 +8,8 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
 import android.util.Base64;
-import de.thedevstack.conversationsplus.utils.Logging;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
index 20f2b45a..999180c5 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
@@ -1,7 +1,5 @@
 package de.thedevstack.conversationsplus.xmpp.jingle;
 
-import de.thedevstack.conversationsplus.utils.Logging;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,6 +12,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.DownloadableFile;
 import de.thedevstack.conversationsplus.persistance.FileBackend;
diff --git a/src/main/java/de/tzur/conversations/Settings.java b/src/main/java/de/tzur/conversations/Settings.java
index b8922f0a..2484a88f 100644
--- a/src/main/java/de/tzur/conversations/Settings.java
+++ b/src/main/java/de/tzur/conversations/Settings.java
@@ -1,8 +1,8 @@
 package de.tzur.conversations;
 
 import android.content.SharedPreferences;
-import de.thedevstack.conversationsplus.utils.Logging;
 
+import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 
 /**