From 1508ee9fd6a7335cfd503a463886ab527b913c91 Mon Sep 17 00:00:00 2001
From: Carl Bingel <kalle.bingel@gmail.com>
Date: Tue, 18 Feb 2020 21:28:51 +0100
Subject: [PATCH] removed some old stuff and added getAttachmentsPath getter

---
 src/main/java/org/asamk/signal/manager/Manager.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 858b00f2..6972eea6 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -30,7 +30,6 @@ import org.asamk.signal.storage.protocol.JsonIdentityKeyStore;
 import org.asamk.signal.storage.threads.ThreadInfo;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
-import org.asamk.signal.JsonAttachment;
 import org.signal.libsignal.metadata.InvalidMetadataMessageException;
 import org.signal.libsignal.metadata.InvalidMetadataVersionException;
 import org.signal.libsignal.metadata.ProtocolDuplicateMessageException;
@@ -145,7 +144,6 @@ public class Manager implements Signal {
         this.dataPath = this.settingsPath + "/data";
         this.attachmentsPath = this.settingsPath + "/attachments";
         this.avatarsPath = this.settingsPath + "/avatars";
-        JsonAttachment.setAttachmentStoragePath(this.attachmentsPath);
     }
 
     public String getUsername() {
@@ -1466,8 +1464,8 @@ public class Manager implements Signal {
         return new File(attachmentsPath, attachmentId + "");
     }
 
-    public String getAttachmentFilePath(long attachmentId) {
-    	return attachmentsPath + File.separator + attachmentId;
+    public String getAttachmentsPath() {
+    	return attachmentsPath;
     }
     
     private File retrieveAttachment(SignalServiceAttachmentPointer pointer) throws IOException, InvalidMessageException {