gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 03:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2023-01-04 11:28:43 +01:00 committed by Andy Scherzinger
parent f1e10f7479
commit ac9d96d3ba
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt
View File

@ -44,7 +44,6 @@ import com.nextcloud.android.common.ui.theme.utils.ColorRole
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.components.filebrowser.models.BrowserFile
import com.nextcloud.talk.components.filebrowser.webdav.ReadFilesystemOperation import com.nextcloud.talk.components.filebrowser.webdav.ReadFilesystemOperation
import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
@ -56,6 +55,7 @@ import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType
import com.nextcloud.talk.utils.FileViewerUtils import com.nextcloud.talk.utils.FileViewerUtils
import com.nextcloud.talk.utils.FileViewerUtils.ProgressUi import com.nextcloud.talk.utils.FileViewerUtils.ProgressUi
import com.owncloud.android.lib.resources.files.model.RemoteFile
import com.stfalcon.chatkit.messages.MessageHolders.IncomingImageMessageViewHolder import com.stfalcon.chatkit.messages.MessageHolders.IncomingImageMessageViewHolder
import io.reactivex.Single import io.reactivex.Single
import io.reactivex.SingleObserver import io.reactivex.SingleObserver
@ -287,7 +287,7 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
override fun onSuccess(readFilesystemOperation: ReadFilesystemOperation) { override fun onSuccess(readFilesystemOperation: ReadFilesystemOperation) {
val davResponse = readFilesystemOperation.readRemotePath() val davResponse = readFilesystemOperation.readRemotePath()
if (davResponse.data != null) { if (davResponse.data != null) {
val browserFileList = davResponse.data as List<BrowserFile> val browserFileList = davResponse.data as List<RemoteFile>
if (browserFileList.isNotEmpty()) { if (browserFileList.isNotEmpty()) {
Handler(context!!.mainLooper).post { Handler(context!!.mainLooper).post {
val resourceId = getDrawableResourceIdForMimeType(browserFileList[0].mimeType) val resourceId = getDrawableResourceIdForMimeType(browserFileList[0].mimeType)

9
app/src/main/java/com/nextcloud/talk/components/filebrowser/webdav/ReadFilesystemOperation.java
View File

@ -23,7 +23,6 @@ package com.nextcloud.talk.components.filebrowser.webdav;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
import com.nextcloud.talk.components.filebrowser.models.BrowserFile;
import com.nextcloud.talk.components.filebrowser.models.DavResponse; import com.nextcloud.talk.components.filebrowser.models.DavResponse;
import com.nextcloud.talk.dagger.modules.RestModule; import com.nextcloud.talk.dagger.modules.RestModule;
import com.nextcloud.talk.data.user.model.User; import com.nextcloud.talk.data.user.model.User;
@ -73,8 +72,6 @@ public class ReadFilesystemOperation {
DavResponse davResponse = new DavResponse(); DavResponse davResponse = new DavResponse();
final List<Response> memberElements = new ArrayList<>(); final List<Response> memberElements = new ArrayList<>();
final Response[] rootElement = new Response[1]; final Response[] rootElement = new Response[1];
final List<BrowserFile> browserFiles = new ArrayList<>();
final List<RemoteFile> remoteFiles = new ArrayList<>();
try { try {
new DavResource(okHttpClient, HttpUrl.parse(url)).propfind(depth, new DavResource(okHttpClient, HttpUrl.parse(url)).propfind(depth,
@ -101,16 +98,12 @@ public class ReadFilesystemOperation {
WebDavFileUtils webDavFileUtils = new WebDavFileUtils(); WebDavFileUtils webDavFileUtils = new WebDavFileUtils();
browserFiles.add(BrowserFile.Companion.getModelFromResponse(rootElement[0], final List<RemoteFile> remoteFiles = new ArrayList<>(1 + memberElements.size());
rootElement[0].getHref().toString().substring(basePath.length())));
remoteFiles.add(webDavFileUtils.parseResponse(rootElement[0], remoteFiles.add(webDavFileUtils.parseResponse(rootElement[0],
Uri.parse(basePath))); Uri.parse(basePath)));
for (Response memberElement : memberElements) { for (Response memberElement : memberElements) {
browserFiles.add(BrowserFile.Companion.getModelFromResponse(memberElement,
memberElement.getHref().toString().substring(basePath.length())));
remoteFiles.add(webDavFileUtils.parseResponse(memberElement, remoteFiles.add(webDavFileUtils.parseResponse(memberElement,
Uri.parse(basePath))); Uri.parse(basePath)));
} }