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

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java

6 files changed, 131 insertions, 56 deletions

diff --git a/libs/thedevstacklogcat/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..eb4efc98 100644
--- a/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java
+++ b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/adapters/LogCatArrayAdapter.java
@@ -116,7 +116,11 @@ public class LogCatArrayAdapter extends ArrayAdapter<String> {
         logcatItems.remove(object);
     }
 
-    public ArrayList<String> getItems() {
-        return this.logcatItems;
+    /**
+     * Returns an unmodifiable copy of the log cat entries.
+     * @return UnmodifiableList of logcat entries.
+     */
+    public List<String> getItems() {
+        return Collections.unmodifiableList(this.logcatItems);
     }
 }
diff --git a/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java b/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
deleted file mode 100644
index 1be04c9c..00000000
--- a/libs/thedevstacklogcat/src/main/java/de/thedevstack/android/logcat/ui/LogCatOutputCopyOnClickListener.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package de.thedevstack.android.logcat.ui;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.view.View;
-import android.widget.Toast;
-
-import java.util.ArrayList;
-
-import de.thedevstack.android.logcat.Logging;
-import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
-
-/**
- * Created by tzur on 20.11.2015.
- */
-public class LogCatOutputCopyOnClickListener implements View.OnClickListener {
-    private final LogCatArrayAdapter logCatOutputAdapter;
-    private final Context context;
-    private final int resIdLogcatCopied;
-    private final int resIdLogcatNotCopied;
-
-    public LogCatOutputCopyOnClickListener(Context context, LogCatArrayAdapter logCatOutputAdapter, int resIdLogcatCopied, int resIdLogcatNotCopied) {
-        this.logCatOutputAdapter = logCatOutputAdapter;
-        this.context = context;
-        this.resIdLogcatCopied = resIdLogcatCopied;
-        this.resIdLogcatNotCopied = resIdLogcatNotCopied;
-    }
-
-    @Override
-    public void onClick(View v) {
-        Logging.d("copylogcat", "Start Copying log cat");
-        ArrayList<String> items = this.logCatOutputAdapter.getItems();
-        if (null != items && !items.isEmpty()) {
-            StringBuilder sb = new StringBuilder();
-            for (String item : items) {
-                sb.append(item);
-                sb.append("\n");
-            }
-            ClipboardManager clipboard = (ClipboardManager) this.context.getSystemService(Context.CLIPBOARD_SERVICE);
-            ClipData clip = ClipData.newPlainText("c+logcat", sb.toString());
-            clipboard.setPrimaryClip(clip);
-            Toast.makeText(this.context, this.context.getText(this.resIdLogcatCopied), Toast.LENGTH_LONG).show();
-        } else {
-            Toast.makeText(this.context, this.context.getText(this.resIdLogcatNotCopied), Toast.LENGTH_LONG).show();
-        }
-    }
-}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
index 52891a91..a1f99a48 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
@@ -2,27 +2,56 @@ package de.thedevstack.conversationsplus.ui;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
 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 de.thedevstack.conversationsplus.ui.listeners.LogCatOutputCopyOnClickListener;
+import de.thedevstack.conversationsplus.utils.ClipboardUtil;
+
 import eu.siacs.conversations.R;
 
 /**
- * Created by tzur on 07.10.2015.
+ * Activity to display the logcat output.
  */
 public class LogCatOutputActivity extends Activity {
+    /**
+     * List adapter containing the logcat entries.
+     */
+    private LogCatArrayAdapter logCatArrayAdapter;
+
     @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();
+        this.logCatArrayAdapter = new LogCatArrayAdapter(this, R.layout.list_item_logcatoutput);
+        lv.setAdapter(this.logCatArrayAdapter);
+        new ReadLogCatAsyncTask(this.logCatArrayAdapter).execute();
         Button copyButton = (Button) findViewById(R.id.actLogOutputCopyButton);
-        copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this, logCatOutputAdapter, R.string.cplus_copied_to_clipboard, R.string.cplus_not_copied_to_clipboard_empty));
+        copyButton.setOnClickListener(new LogCatOutputCopyOnClickListener(this.logCatArrayAdapter));
+        registerForContextMenu(lv);
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
+        super.onCreateContextMenu(menu, v, menuInfo);
+        menu.add(0, 123456789, 0, R.string.cplus_copy_item);
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        if (123456789 == item.getItemId()) {
+            AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo();
+            String itemText = this.logCatArrayAdapter.getItems().get(info.position);
+            ClipboardUtil.copyToClipboard(itemText);
+            return true;
+        }
+        return super.onContextItemSelected(item);
     }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/LogCatOutputCopyOnClickListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/LogCatOutputCopyOnClickListener.java
new file mode 100644
index 00000000..f71c67db
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/LogCatOutputCopyOnClickListener.java
@@ -0,0 +1,41 @@
+package de.thedevstack.conversationsplus.ui.listeners;
+
+import android.view.View;
+
+import java.util.List;
+
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.android.logcat.adapters.LogCatArrayAdapter;
+import de.thedevstack.conversationsplus.utils.ClipboardUtil;
+
+/**
+ * OnClickListener to copy logcat entries from LogCatArrayAdapter to clipboard.
+ */
+public class LogCatOutputCopyOnClickListener implements View.OnClickListener {
+    private final LogCatArrayAdapter logCatOutputAdapter;
+
+    public LogCatOutputCopyOnClickListener(LogCatArrayAdapter logCatOutputAdapter) {
+        this.logCatOutputAdapter = logCatOutputAdapter;
+    }
+
+    /**
+     * Copies the entries of LogCatArrayAdapter separated by a new line to the clipboard.
+     *
+     * @param v The view that was clicked.
+     */
+    @Override
+    public void onClick(View v) {
+        Logging.d("copylogcat", "Start Copying log cat");
+        List<String> items = this.logCatOutputAdapter.getItems();
+        String textToCopy = null;
+        if (null != items && !items.isEmpty()) {
+            StringBuilder sb = new StringBuilder();
+            for (String item : items) {
+                sb.append(item);
+                sb.append("\n");
+            }
+            textToCopy = sb.toString();
+        }
+        ClipboardUtil.copyToClipboard("c+logcat", textToCopy);
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ClipboardUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ClipboardUtil.java
new file mode 100644
index 00000000..4d6220e0
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ClipboardUtil.java
@@ -0,0 +1,48 @@
+package de.thedevstack.conversationsplus.utils;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.widget.Toast;
+
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+
+import eu.siacs.conversations.R;
+
+/**
+ * Util class to work with the Clipboard.
+ */
+public final class ClipboardUtil {
+    private static final String CLIPBOARD_LABEL = "c+clipboard";
+
+    /**
+     * Copies a text to the clipboard.
+     * @param clipboardLabel the label to show to a user to allow identifying the text in clipboard.
+     * @param text the text to copy
+     */
+    public static void copyToClipboard(String clipboardLabel, String text) {
+        Context context = ConversationsPlusApplication.getAppContext();
+        if (null != text && !text.isEmpty()) {
+            String label = (null == clipboardLabel) ? CLIPBOARD_LABEL : clipboardLabel;
+            ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+            ClipData clip = ClipData.newPlainText(label, text);
+            clipboard.setPrimaryClip(clip);
+            Toast.makeText(context, R.string.cplus_copied_to_clipboard, Toast.LENGTH_LONG).show();
+        } else {
+            Toast.makeText(context, R.string.cplus_not_copied_to_clipboard_empty, Toast.LENGTH_LONG).show();
+        }
+
+    }
+
+    /**
+     * Copies a text to the clipboard.
+     * @param text the text to copy
+     */
+    public static void copyToClipboard(String text) {
+        copyToClipboard(CLIPBOARD_LABEL, text);
+    }
+
+    private ClipboardUtil() {
+        // helper class - avoid instantiation
+    }
+}
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3e939114..2578f0a8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -666,4 +666,5 @@
 	<string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string>
 	<string name="select_image_and_crop">Select image and crop</string>
 	<string name="this_account_is_disabled">You have disabled this account</string>
+	<string name="cplus_copy_item">Copy item</string>
 </resources>