Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

3 files changed, 32 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
new file mode 100644
index 00000000..733da0cc
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
@@ -0,0 +1,29 @@
+package de.thedevstack.conversationsplus.ui;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Button;
+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 eu.siacs.conversations.R;
+
+/**
+ * Created by tzur on 07.10.2015.
+ */
+public class LogCatOutputActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_logcatoutput);
+        ListView lv = (ListView)findViewById(R.id.actLogInfoOutput);
+        LogCatArrayAdapter logCatOutputAdapter = new LogCatArrayAdapter(this, R.layout.list_item_logcatoutput);
+        lv.setAdapter(logCatOutputAdapter);
+        new ReadLogCatAsyncTask(logCatOutputAdapter).execute();
+        Button copyButton = (Button) findViewById(R.id.actLogOutputCopyButton);
+        copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter, R.string.cplus_copied_to_clipboard));
+    }
+}
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 7d82223c..b1b2298b 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,13 @@ 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 eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
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.