diff options
| author | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-02-14 21:34:34 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-02-14 21:34:34 +0100 |
| commit | 827ae43d8b881b07d043b4050b9d6a30d7362787 (patch) | |
| tree | f53b5333bde9575eebb72666f576043d4f84027d | |
| parent | 3f12418b601bf626b478d78c488db0ce1041ef08 (diff) | |
| parent | dd93aaf50744904601eef3c83bb87ca844a0e76f (diff) | |
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/utils/Resolver.java | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -11,7 +11,7 @@ Pix-Art Messenger ist eine Kopie der offiziellen Android-App [Conversations](htt Download ist hier möglich: -<a href='https://play.google.com/store/apps/details?id=de.pixart.messenger'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height="100"/></a> <a href="https://f-droid.org/app/de.pixart.messenger"><img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="100"></a> +<a href='https://play.google.com/store/apps/details?id=de.pixart.messenger'><img alt='Jeztz bei Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/de_badge_web_generic.png' height="100"/></a> <a href="https://f-droid.org/app/de.pixart.messenger"><img src="https://f-droid.org/badge/get-it-on-de.png" alt="Jetzt bei F-Droid" height="100"></a> Alternativ kannst du den Messenger auch direkt hier von GitHub unter [Releases](https://github.com/kriztan/Pix-Art-Messenger/releases/latest) herunterladen. diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java index 9e25e2917..ed5e62fd3 100644 --- a/src/main/java/de/pixart/messenger/utils/Resolver.java +++ b/src/main/java/de/pixart/messenger/utils/Resolver.java @@ -373,7 +373,7 @@ public class Resolver { private int priority; private Socket socket; - private String logID; + private String logID = ""; static Result fromRecord(final SRV srv, final boolean directTls) { Result result = new Result(); |