show conversation media in contact/conference details

2 files changed, 11 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
index b0da108ba..e66873acc 100644
--- a/src/main/java/de/pixart/messenger/services/ExportLogsService.java
+++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
@@ -41,7 +41,7 @@ import static de.pixart.messenger.ui.SettingsActivity.USE_MULTI_ACCOUNTS;
 public class ExportLogsService extends XmppConnectionService {
 
     private static final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-    private static final String DIRECTORY_STRING_FORMAT = FileBackend.getConversationsDirectory("Chats", false) + "%s";
+    private static final String DIRECTORY_STRING_FORMAT = FileBackend.getAppLogsDirectory() + "%s";
     private static final String MESSAGE_STRING_FORMAT = "(%s) %s: %s\n";
     private static AtomicBoolean running = new AtomicBoolean(false);
     boolean ReadableLogsEnabled = false;
@@ -171,7 +171,7 @@ public class ExportLogsService extends XmppConnectionService {
         // Get hold of the db:
         FileInputStream InputFile = new FileInputStream(this.getDatabasePath(DatabaseBackend.DATABASE_NAME));
         // Set the output folder on the SDcard
-        File directory = new File(FileBackend.getConversationsDirectory("Database", false));
+        File directory = new File(FileBackend.getBackupDirectory());
         // Create the folder if it doesn't exist:
         if (!directory.exists()) {
             boolean directory_created = directory.mkdirs();
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 25d4fb2b8..cd35198dc 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -116,6 +116,7 @@ import de.pixart.messenger.persistance.FileBackend;
 import de.pixart.messenger.ui.SettingsActivity;
 import de.pixart.messenger.ui.UiCallback;
 import de.pixart.messenger.ui.interfaces.OnAvatarPublication;
+import de.pixart.messenger.ui.interfaces.OnMediaLoaded;
 import de.pixart.messenger.ui.interfaces.OnSearchResultsAvailable;
 import de.pixart.messenger.utils.Compatibility;
 import de.pixart.messenger.utils.ConversationsFileObserver;
@@ -2681,6 +2682,14 @@ public class XmppConnectionService extends Service {
         return false;
     }
 
+    public void getAttachments(final Conversation conversation, int limit, final OnMediaLoaded onMediaLoaded) {
+        getAttachments(conversation.getAccount(), conversation.getJid().asBareJid(), limit, onMediaLoaded);
+    }
+
+    public void getAttachments(final Account account, final Jid jid, final int limit, final OnMediaLoaded onMediaLoaded) {
+        new Thread(() -> onMediaLoaded.onMediaLoaded(fileBackend.convertToAttachments(databaseBackend.getRelativeFilePaths(account, jid, limit)))).start();
+    }
+
     public void persistSelfNick(MucOptions.User self) {
         final Conversation conversation = self.getConversation();
         Jid full = self.getFullJid();