feat: Pass on file info to also open the file for potential editing via Files app within the full screen activity

AndyScherzinger · AndyScherzinger · commit 3511d90dcce9 · 2026-02-27T11:59:56.000+01:00
Resolves #1683 Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
diff --git a/app/src/main/java/com/nextcloud/talk/fullscreenfile/FullScreenTextScreen.kt b/app/src/main/java/com/nextcloud/talk/fullscreenfile/FullScreenTextScreen.kt
@@ -34,11 +34,21 @@ import com.nextcloud.talk.components.StandardAppBar
 import io.noties.markwon.Markwon
 
 @Composable
-fun FullScreenTextScreen(title: String, text: String, isMarkdown: Boolean, onShare: () -> Unit, onSave: () -> Unit) {
-    val menuItems = listOf(
-        stringResource(R.string.share) to onShare,
-        stringResource(R.string.nc_save_message) to onSave
-    )
+fun FullScreenTextScreen(
+    title: String,
+    text: String,
+    isMarkdown: Boolean,
+    onShare: () -> Unit,
+    onSave: () -> Unit,
+    onOpenInFilesApp: (() -> Unit)? = null
+) {
+    val menuItems = buildList {
+        add(stringResource(R.string.share) to onShare)
+        add(stringResource(R.string.nc_save_message) to onSave)
+        if (onOpenInFilesApp != null) {
+            add(stringResource(R.string.open_in_files_app) to onOpenInFilesApp)
+        }
+    }
 
     Scaffold(
         topBar = { StandardAppBar(title = title, menuItems = menuItems) },
diff --git a/app/src/main/java/com/nextcloud/talk/fullscreenfile/FullScreenTextViewerActivity.kt b/app/src/main/java/com/nextcloud/talk/fullscreenfile/FullScreenTextViewerActivity.kt
@@ -8,12 +8,14 @@
  */
 package com.nextcloud.talk.fullscreenfile
 
+import android.content.ComponentName
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material3.MaterialTheme
 import androidx.core.content.FileProvider
+import androidx.core.net.toUri
 import androidx.fragment.app.DialogFragment
 import autodagger.AutoInjector
 import com.nextcloud.talk.BuildConfig
@@ -22,8 +24,11 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.components.ColoredStatusBar
 import com.nextcloud.talk.ui.dialog.SaveToStorageDialogFragment
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
+import com.nextcloud.talk.utils.AccountUtils.canWeOpenFilesApp
 import com.nextcloud.talk.utils.Mimetype.TEXT_PREFIX_GENERIC
 import com.nextcloud.talk.utils.adjustUIForAPILevel35
+import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACCOUNT
+import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FILE_ID
 import java.io.File
 import javax.inject.Inject
 
@@ -39,6 +44,10 @@ class FullScreenTextViewerActivity : AppCompatActivity() {
 
         val fileName = intent.getStringExtra("FILE_NAME").orEmpty()
         val isMarkdown = intent.getBooleanExtra("IS_MARKDOWN", false)
+        val fileId = intent.getStringExtra("FILE_ID").orEmpty()
+        val link = intent.getStringExtra("LINK")
+        val username = intent.getStringExtra("USERNAME").orEmpty()
+        val baseUrl = intent.getStringExtra("BASE_URL").orEmpty()
         val path = applicationContext.cacheDir.absolutePath + "/" + fileName
         val text = readFile(path)
 
@@ -53,12 +62,36 @@ class FullScreenTextViewerActivity : AppCompatActivity() {
                     text = text,
                     isMarkdown = isMarkdown,
                     onShare = { shareFile(path) },
-                    onSave = { showSaveDialog(fileName) }
+                    onSave = { showSaveDialog(fileName) },
+                    onOpenInFilesApp = if (fileId.isNotEmpty()) {
+                        { openInFilesApp(link, fileId, username, baseUrl) }
+                    } else {
+                        null
+                    }
                 )
             }
         }
     }
 
+    private fun openInFilesApp(link: String?, fileId: String, username: String, baseUrl: String) {
+        val accountString = "$username@${baseUrl.replace("https://", "").replace("http://", "")}"
+        if (canWeOpenFilesApp(this, accountString)) {
+            val filesAppIntent = Intent(Intent.ACTION_VIEW, null)
+            val componentName = ComponentName(
+                getString(R.string.nc_import_accounts_from),
+                "com.owncloud.android.ui.activity.FileDisplayActivity"
+            )
+            filesAppIntent.component = componentName
+            filesAppIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            filesAppIntent.setPackage(getString(R.string.nc_import_accounts_from))
+            filesAppIntent.putExtra(KEY_ACCOUNT, accountString)
+            filesAppIntent.putExtra(KEY_FILE_ID, fileId)
+            startActivity(filesAppIntent)
+        } else if (!link.isNullOrEmpty()) {
+            startActivity(Intent(Intent.ACTION_VIEW, link.toUri()))
+        }
+    }
+
     private fun shareFile(path: String) {
         val shareUri = FileProvider.getUriForFile(this, BuildConfig.APPLICATION_ID, File(path))
         val shareIntent = Intent().apply {
diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
@@ -97,6 +97,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
             openOrDownloadFile(
                 fileInfo,
                 path,
+                link,
                 mimetype,
                 progressUi,
                 openWhenDownloaded
@@ -125,25 +126,27 @@ class FileViewerUtils(private val context: Context, private val user: User) {
     private fun openOrDownloadFile(
         fileInfo: FileInfo,
         path: String,
+        link: String?,
         mimetype: String?,
         progressUi: ProgressUi,
         openWhenDownloaded: Boolean
     ) {
         val file = File(context.cacheDir, fileInfo.fileName)
         if (file.exists()) {
-            openFileByMimetype(fileInfo.fileName, mimetype)
+            openFileByMimetype(fileInfo.fileName, mimetype, link, fileInfo.fileId)
         } else {
             downloadFileToCache(
                 fileInfo,
                 path,
+                link,
                 mimetype,
                 progressUi,
                 openWhenDownloaded
             )
         }
     }
 
-    private fun openFileByMimetype(filename: String, mimetype: String?) {
+    private fun openFileByMimetype(filename: String, mimetype: String?, link: String? = null, fileId: String = "") {
         if (mimetype != null) {
             when (mimetype) {
                 AUDIO_MPEG,
@@ -161,7 +164,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
                 -> openImageView(filename, mimetype)
                 TEXT_MARKDOWN,
                 TEXT_PLAIN
-                -> openTextView(filename, mimetype)
+                -> openTextView(filename, mimetype, link, fileId)
                 else
                 -> openFileByExternalApp(filename, mimetype)
             }
@@ -236,10 +239,14 @@ class FileViewerUtils(private val context: Context, private val user: User) {
         context.startActivity(fullScreenMediaIntent)
     }
 
-    private fun openTextView(filename: String, mimetype: String) {
+    private fun openTextView(filename: String, mimetype: String, link: String?, fileId: String) {
         val fullScreenTextViewerIntent = Intent(context, FullScreenTextViewerActivity::class.java)
         fullScreenTextViewerIntent.putExtra("FILE_NAME", filename)
         fullScreenTextViewerIntent.putExtra("IS_MARKDOWN", isMarkdown(mimetype))
+        fullScreenTextViewerIntent.putExtra("FILE_ID", fileId)
+        fullScreenTextViewerIntent.putExtra("LINK", link)
+        fullScreenTextViewerIntent.putExtra("USERNAME", user.username)
+        fullScreenTextViewerIntent.putExtra("BASE_URL", user.baseUrl)
         context.startActivity(fullScreenTextViewerIntent)
     }
 
@@ -265,6 +272,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
     private fun downloadFileToCache(
         fileInfo: FileInfo,
         path: String,
+        link: String?,
         mimetype: String?,
         progressUi: ProgressUi,
         openWhenDownloaded: Boolean
@@ -316,7 +324,9 @@ class FileViewerUtils(private val context: Context, private val user: User) {
                     mimetype,
                     workInfo!!,
                     progressUi,
-                    openWhenDownloaded
+                    openWhenDownloaded,
+                    link,
+                    fileInfo.fileId
                 )
             }
     }
@@ -326,7 +336,9 @@ class FileViewerUtils(private val context: Context, private val user: User) {
         mimetype: String?,
         workInfo: WorkInfo,
         progressUi: ProgressUi,
-        openWhenDownloaded: Boolean
+        openWhenDownloaded: Boolean,
+        link: String? = null,
+        fileId: String = ""
     ) {
         when (workInfo.state) {
             WorkInfo.State.RUNNING -> {
@@ -341,7 +353,7 @@ class FileViewerUtils(private val context: Context, private val user: User) {
             }
             WorkInfo.State.SUCCEEDED -> {
                 if (progressUi.previewImage.isShown && openWhenDownloaded) {
-                    openFileByMimetype(fileName, mimetype)
+                    openFileByMimetype(fileName, mimetype, link, fileId)
                 } else {
                     Log.d(
                         TAG,
