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

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

1 files changed, 6 insertions, 2 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);
     }
 }