Merge master-origin

Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml

1 files changed, 0 insertions, 65 deletions

diff --git a/libs/minidns/src/main/java/de/measite/minidns/record/TXT.java b/libs/minidns/src/main/java/de/measite/minidns/record/TXT.java
deleted file mode 100644
index 03e73040..00000000
--- a/libs/minidns/src/main/java/de/measite/minidns/record/TXT.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package de.measite.minidns.record;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-import de.measite.minidns.Record.TYPE;
-import de.measite.minidns.util.NameUtil;
-
-/**
- * TXT record (actually a binary blob with wrappers for text content).
- */
-public class TXT implements Data {
-
-    protected byte[] blob;
-
-    public byte[] getBlob() {
-        return blob;
-    }
-
-    public void setBlob(byte[] blob) {
-        this.blob = blob;
-    }
-
-    public String getText() {
-        try {
-            return (new String(blob, "UTF-8")).intern();
-        } catch (Exception e) {
-            /* Can't happen for UTF-8 unless it's really a blob */
-            return null;
-        }
-    }
-
-    public void setText(String text) {
-        try {
-            this.blob = text.getBytes("UTF-8");
-        } catch (Exception e) {
-            /* Can't happen, UTF-8 IS supported */
-            throw new RuntimeException("UTF-8 not supported", e);
-        }
-    }
-
-    @Override
-    public byte[] toByteArray() {
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-
-    @Override
-    public void parse(DataInputStream dis, byte[] data, int length)
-        throws IOException
-    {
-        blob = new byte[length];
-        dis.readFully(blob);
-    }
-
-    @Override
-    public TYPE getType() {
-        return TYPE.TXT;
-    }
-
-    @Override
-    public String toString() {
-        return "\"" + getText() + "\"";
-    }
-
-}