wip

Signed-off-by: tobiasKaminsky <[email protected]>
nextcloud · Mar 30, 2023 · 82f16b0 · 82f16b0
1 parent 30ed116
commit 82f16b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt
@@ -48,7 +48,6 @@ import com.google.android.material.card.MaterialCardView
 import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication
 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.data.user.model.User
 import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding
@@ -61,6 +60,7 @@ import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType
 import com.nextcloud.talk.utils.FileViewerUtils
 import com.nextcloud.talk.utils.FileViewerUtils.ProgressUi
+import com.owncloud.android.lib.resources.files.model.RemoteFile
 import com.stfalcon.chatkit.messages.MessageHolders.IncomingImageMessageViewHolder
 import io.reactivex.Single
 import io.reactivex.SingleObserver
@@ -318,7 +318,7 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
  override fun onSuccess(readFilesystemOperation: ReadFilesystemOperation) {
  val davResponse = readFilesystemOperation.readRemotePath()
  if (davResponse.data != null) {
- val browserFileList = davResponse.data as List<BrowserFile>
+ val browserFileList = davResponse.data as List<RemoteFile>
  if (browserFileList.isNotEmpty()) {
  Handler(context!!.mainLooper).post {
  val resourceId = getDrawableResourceIdForMimeType(browserFileList[0].mimeType)

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