X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=2310aca328b3e3574cf6722639472ac9b57f170b;hb=5c5ef0964da82ea0f677ea0e7f24901f8e31af88;hp=7133797491b0878bfe54d6f7ffb06093ce45fb89;hpb=4f686e5c5ddcf94ffdf074b953493c148fb2ab32;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 7133797..2310aca 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -26,6 +26,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.core.Core.SoneStatus;
+import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Reply;
@@ -154,7 +155,11 @@ public class SoneDownloader extends AbstractService {
 			soneInputStream = soneBucket.getInputStream();
 			Sone parsedSone = parseSone(originalSone, soneInputStream);
 			if (parsedSone != null) {
-				parsedSone.setRequestUri(requestUri.setMetaString(new String[0]));
+				if (requestUri.getKeyType().equals("USK")) {
+					parsedSone.setRequestUri(requestUri.setMetaString(new String[0]));
+				} else {
+					parsedSone.setRequestUri(requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]));
+				}
 			}
 			return parsedSone;
 		} catch (IOException ioe1) {
@@ -215,6 +220,17 @@ public class SoneDownloader extends AbstractService {
 			return null;
 		}
 
+		SimpleXML clientXml = soneXml.getNode("client");
+		if (clientXml != null) {
+			String clientName = clientXml.getValue("name", null);
+			String clientVersion = clientXml.getValue("version", null);
+			if ((clientName == null) || (clientVersion == null)) {
+				logger.log(Level.WARNING, "Download Sone %s with client XML but missing name or version!", sone);
+				return null;
+			}
+			sone.setClient(new Client(clientName, clientVersion));
+		}
+
 		String soneRequestUri = soneXml.getValue("request-uri", null);
 		if (soneRequestUri != null) {
 			try {