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, 43 deletions

diff --git a/libs/minidns/src/main/java/de/measite/minidns/record/A.java b/libs/minidns/src/main/java/de/measite/minidns/record/A.java
deleted file mode 100644
index 4311c651..00000000
--- a/libs/minidns/src/main/java/de/measite/minidns/record/A.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package de.measite.minidns.record;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-
-import de.measite.minidns.Record.TYPE;
-
-/**
- * A record payload (ip pointer).
- */
-public class A implements Data {
-
-    /**
-     * Target IP.
-     */
-    private byte[] ip;
-
-    @Override
-    public TYPE getType() {
-        return TYPE.A;
-    }
-
-    @Override
-    public byte[] toByteArray() {
-        return ip;
-    }
-
-    @Override
-    public void parse(DataInputStream dis, byte[] data, int length)
-            throws IOException {
-        ip = new byte[4];
-        dis.readFully(ip);
-    }
-
-    @Override
-    public String toString() {
-        return Integer.toString(ip[0] & 0xff) + "." +
-               Integer.toString(ip[1] & 0xff) + "." +
-               Integer.toString(ip[2] & 0xff) + "." +
-               Integer.toString(ip[3] & 0xff);
-    }
-
-}