From 48ec8928f6e3b93f73df683d354e21cea0ebc45b Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 15:29:52 +0200
Subject: [PATCH 1/8] do not display errors from start

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 53 ++++++++++++-------
 1 file changed, 34 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index 919eb152c3ea..56bf1f1cb7e2 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -61,6 +61,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
     RichDocumentsTemplateAdapter.ClickListener,
     Injectable {
     private var fileNames: MutableSet<String>? = null
+    private var hasUserInteracted = false
 
     @Inject
     lateinit var currentAccount: CurrentAccountProvider
@@ -181,6 +182,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) = Unit
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) = Unit
             override fun afterTextChanged(s: Editable) {
+                hasUserInteracted = true
                 checkEnablingCreateButton()
             }
         })
@@ -303,32 +305,46 @@ class ChooseRichDocumentsTemplateDialogFragment :
             requireContext(),
             fileNames ?: setOf()
         )
-        val isExtension = (
-            selectedTemplate == null ||
-                !name.equals(
-                    DOT + selectedTemplate.extension,
-                    ignoreCase = true
-                )
-            )
-        val isChangedExtension = name.substringAfterLast(DOT) != selectedTemplate?.extension
+        val isJustExtension = selectedTemplate != null &&
+            name.equals(DOT + selectedTemplate.extension, ignoreCase = true)
+
+        val isChangedExtension = selectedTemplate != null &&
+            name.contains(DOT) &&
+            name.substringAfterLast(DOT).isNotEmpty() &&
+            name.substringAfterLast(DOT) != selectedTemplate.extension
 
-        val isEnable = isExtension && !isChangedExtension && errorMessage == null
+        val isEnable = selectedTemplate != null && errorMessage == null && !isJustExtension
 
         positiveButton?.let {
             it.isEnabled = isEnable
             it.isClickable = isEnable
         }
 
+        if (!hasUserInteracted) {
+            return
+        }
+
         binding.filenameContainer.run {
-            isErrorEnabled = !isEnable
-            error = if (!isEnable) {
-                when {
-                    errorMessage != null -> errorMessage
-                    isChangedExtension -> getString(R.string.extension_cannot_be_changed)
-                    else -> getText(R.string.filename_empty)
+            when {
+                errorMessage != null -> {
+                    isErrorEnabled = true
+                    error = errorMessage
+                }
+
+                isChangedExtension -> {
+                    isErrorEnabled = true
+                    error = getString(R.string.extension_cannot_be_changed)
+                }
+
+                isJustExtension -> {
+                    isErrorEnabled = true
+                    error = getText(R.string.filename_empty)
+                }
+
+                else -> {
+                    isErrorEnabled = false
+                    error = null
                 }
-            } else {
-                null
             }
         }
     }
@@ -455,8 +471,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
                     onTemplateChosen(templateList[0])
                     binding.list.visibility = View.GONE
                 } else {
-                    val name = DOT + templateList[0].extension
-                    binding.filename.setText(name)
+                    binding.filename.setText(DOT + templateList[0].extension)
                     binding.helperText.visibility = View.VISIBLE
                 }
 

From 366b0b5218ff57626a236c8ab00557f2baa59409 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 15:49:45 +0200
Subject: [PATCH 2/8] speed up template fetch

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 74 +++++++++----------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index 56bf1f1cb7e2..e11833b87287 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -17,6 +17,7 @@ import android.text.TextWatcher
 import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -49,6 +50,9 @@ import com.owncloud.android.utils.FileStorageUtils
 import com.owncloud.android.utils.KeyboardUtils
 import com.owncloud.android.utils.NextcloudServer
 import com.owncloud.android.utils.theme.ViewThemeUtils
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 
@@ -135,7 +139,10 @@ class ChooseRichDocumentsTemplateDialogFragment :
         viewThemeUtils.material.colorTextInputLayout(binding.filenameContainer)
 
         val type = Type.valueOf(arguments.getString(ARG_TYPE) ?: "")
-        FetchTemplateTask(this, client).execute(type)
+
+        lifecycleScope.launch {
+            fetchTemplate(type)
+        }
 
         initList(type)
         addTextChangeListener()
@@ -428,55 +435,42 @@ class ChooseRichDocumentsTemplateDialogFragment :
         }
     }
 
-    @Suppress("DEPRECATION")
-    private class FetchTemplateTask(
-        chooseTemplateDialogFragment: ChooseRichDocumentsTemplateDialogFragment,
-        private val client: OwnCloudClient?
-    ) : AsyncTask<Type?, Void?, List<Template>>() {
-        private val chooseTemplateDialogFragmentWeakReference = WeakReference(chooseTemplateDialogFragment)
+    @SuppressLint("SetTextI18n")
+    private suspend fun fetchTemplate(type: Type) = withContext(Dispatchers.IO) {
+        client ?: return@withContext
 
-        @Deprecated("Deprecated in Java")
-        override fun doInBackground(vararg type: Type?): List<Template> {
-            val fetchTemplateOperation = FetchTemplateOperation(type[0])
-            val result = fetchTemplateOperation.execute(client)
+        val templateList = mutableListOf<Template>()
 
-            if (!result.isSuccess) {
-                return ArrayList()
-            }
+        val fetchTemplateOperation = FetchTemplateOperation(type)
+        val result = fetchTemplateOperation.execute(client)
 
-            val templateList: MutableList<Template> = ArrayList()
-            for (`object` in result.data) {
-                templateList.add(`object` as Template)
+        if (result.isSuccess) {
+            for (data in result.data) {
+                templateList.add(data as Template)
             }
+        }
 
-            return templateList
+        if (!isAdded) {
+            Log_OC.e(TAG, "Error streaming file: no previewMediaFragment!")
+            return@withContext
         }
 
-        @Deprecated("Deprecated in Java")
-        override fun onPostExecute(templateList: List<Template>) {
-            val fragment = chooseTemplateDialogFragmentWeakReference.get()
-            if (fragment == null || !fragment.isAdded) {
-                Log_OC.e(TAG, "Error streaming file: no previewMediaFragment!")
-                return
+        withContext(Dispatchers.Main) {
+            if (templateList.isEmpty()) {
+                dismiss()
+                DisplayUtils.showSnackMessage(requireActivity(), R.string.error_retrieving_templates)
+                return@withContext
             }
 
-            fragment.run {
-                if (templateList.isEmpty()) {
-                    dismiss()
-                    DisplayUtils.showSnackMessage(requireActivity(), R.string.error_retrieving_templates)
-                    return
-                }
-
-                if (templateList.size == SINGLE_TEMPLATE) {
-                    onTemplateChosen(templateList[0])
-                    binding.list.visibility = View.GONE
-                } else {
-                    binding.filename.setText(DOT + templateList[0].extension)
-                    binding.helperText.visibility = View.VISIBLE
-                }
-
-                setTemplateList(templateList)
+            if (templateList.size == SINGLE_TEMPLATE) {
+                onTemplateChosen(templateList[0])
+                binding.list.visibility = View.GONE
+            } else {
+                binding.filename.setText(DOT + templateList[0].extension)
+                binding.helperText.visibility = View.VISIBLE
             }
+
+            setTemplateList(templateList)
         }
     }
 

From 1746b5f069042d34b38663b8868cd29b8982d479 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 15:51:33 +0200
Subject: [PATCH 3/8] simplify fetch template

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index e11833b87287..a8a97bdfc927 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -437,18 +437,14 @@ class ChooseRichDocumentsTemplateDialogFragment :
 
     @SuppressLint("SetTextI18n")
     private suspend fun fetchTemplate(type: Type) = withContext(Dispatchers.IO) {
-        client ?: return@withContext
+        val client = client ?: return@withContext
 
-        val templateList = mutableListOf<Template>()
-
-        val fetchTemplateOperation = FetchTemplateOperation(type)
-        val result = fetchTemplateOperation.execute(client)
-
-        if (result.isSuccess) {
-            for (data in result.data) {
-                templateList.add(data as Template)
-            }
-        }
+        val templateList = FetchTemplateOperation(type)
+            .execute(client)
+            .takeIf { it.isSuccess }
+            ?.data
+            ?.filterIsInstance<Template>()
+            ?: return@withContext
 
         if (!isAdded) {
             Log_OC.e(TAG, "Error streaming file: no previewMediaFragment!")
@@ -462,12 +458,15 @@ class ChooseRichDocumentsTemplateDialogFragment :
                 return@withContext
             }
 
-            if (templateList.size == SINGLE_TEMPLATE) {
-                onTemplateChosen(templateList[0])
-                binding.list.visibility = View.GONE
-            } else {
-                binding.filename.setText(DOT + templateList[0].extension)
-                binding.helperText.visibility = View.VISIBLE
+            when (templateList.size) {
+                SINGLE_TEMPLATE -> {
+                    onTemplateChosen(templateList[0])
+                    binding.list.visibility = View.GONE
+                }
+                else -> {
+                    binding.filename.setText(DOT + templateList[0].extension)
+                    binding.helperText.visibility = View.VISIBLE
+                }
             }
 
             setTemplateList(templateList)

From 7e174a10f517a5cee5086f89551fe62f50f88daf Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 15:56:29 +0200
Subject: [PATCH 4/8] speed up file creation from template

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 104 +++++++-----------
 1 file changed, 38 insertions(+), 66 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index a8a97bdfc927..263eec021c79 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -10,7 +10,6 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Dialog
 import android.content.Intent
-import android.os.AsyncTask
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
@@ -53,7 +52,6 @@ import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import java.lang.ref.WeakReference
 import javax.inject.Inject
 
 /**
@@ -226,7 +224,10 @@ class ChooseRichDocumentsTemplateDialogFragment :
         waitDialog = newInstance(R.string.wait_a_moment, false).also {
             it.show(parentFragmentManager, WAIT_DIALOG_TAG)
         }
-        CreateFileFromTemplateTask(this, client, template, path, currentAccount.user).execute()
+
+        lifecycleScope.launch {
+            createFileFromTemplate(template, path, currentAccount.user)
+        }
     }
 
     @SuppressLint("NotifyDataSetChanged")
@@ -356,68 +357,43 @@ class ChooseRichDocumentsTemplateDialogFragment :
         }
     }
 
-    @Suppress("DEPRECATION")
-    private class CreateFileFromTemplateTask(
-        chooseTemplateDialogFragment: ChooseRichDocumentsTemplateDialogFragment?,
-        private val client: OwnCloudClient?,
-        private val template: Template,
-        private val path: String,
-        private val user: User
-    ) : AsyncTask<Void?, Void?, String>() {
-        private val chooseTemplateDialogFragmentWeakReference = WeakReference(chooseTemplateDialogFragment)
-        private var file: OCFile? = null
-
-        @Suppress("ReturnCount")
-        @Deprecated("Deprecated in Java")
-        override fun doInBackground(vararg voids: Void?): String {
-            val result = CreateFileFromTemplateOperation(path, template.id).execute(client)
-
-            if (!result.isSuccess) {
-                return ""
-            }
-
-            // get file
-            val newFileResult = ReadFileRemoteOperation(path).execute(client)
-
-            if (!newFileResult.isSuccess) {
-                return ""
-            }
-
-            val temp = FileStorageUtils.fillOCFile(newFileResult.data[0] as RemoteFile)
-
-            if (chooseTemplateDialogFragmentWeakReference.get() == null) {
-                return ""
-            }
-
-            val storageManager = FileDataStorageManager(
-                user,
-                chooseTemplateDialogFragmentWeakReference.get()!!.requireContext().contentResolver
-            )
-            storageManager.saveFile(temp)
-            file = storageManager.getFileByPath(path)
+    private suspend fun createFileFromTemplate(template: Template, path: String, user: User) = withContext(Dispatchers.IO) {
+        val result = CreateFileFromTemplateOperation(path, template.id).execute(client)
+        if (!result.isSuccess) {
+            return@withContext
+        }
 
-            return result.data[0].toString()
+        // get file
+        val newFileResult = ReadFileRemoteOperation(path).execute(client)
+        if (!newFileResult.isSuccess) {
+            return@withContext
         }
 
-        @Deprecated("Deprecated in Java")
-        override fun onPostExecute(url: String) {
-            val fragment = chooseTemplateDialogFragmentWeakReference.get()
+        val temp = FileStorageUtils.fillOCFile(newFileResult.data[0] as RemoteFile)
+        val storageManager = FileDataStorageManager(
+            user,
+            requireContext().contentResolver
+        )
+        storageManager.saveFile(temp)
+
+        val file = storageManager.getFileByPath(path)
+        val url = result.data[0].toString()
 
-            if (fragment == null || !fragment.isAdded) {
+        withContext(Dispatchers.Main) {
+            if (!isAdded) {
                 Log_OC.e(TAG, "Error creating file from template!")
-                return
+                return@withContext
             }
 
-            fragment.waitDialog?.dismiss()
+            waitDialog?.dismiss()
 
             if (url.isEmpty()) {
-                fragment.dismiss()
+                dismiss()
                 DisplayUtils.showSnackMessage(
-                    fragment.requireActivity(),
+                    requireActivity(),
                     R.string.error_creating_file_from_template
                 )
-
-                return
+                return@withContext
             }
 
             val intent = Intent(MainApp.getAppContext(), RichDocumentsEditorWebView::class.java).apply {
@@ -428,10 +404,8 @@ class ChooseRichDocumentsTemplateDialogFragment :
                 putExtra(ExternalSiteWebView.EXTRA_TEMPLATE, template)
             }
 
-            fragment.run {
-                startActivity(intent)
-                dismiss()
-            }
+            startActivity(intent)
+            dismiss()
         }
     }
 
@@ -463,6 +437,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
                     onTemplateChosen(templateList[0])
                     binding.list.visibility = View.GONE
                 }
+
                 else -> {
                     binding.filename.setText(DOT + templateList[0].extension)
                     binding.helperText.visibility = View.VISIBLE
@@ -483,15 +458,12 @@ class ChooseRichDocumentsTemplateDialogFragment :
 
         @JvmStatic
         @NextcloudServer(max = 18) // will be removed in favor of generic direct editing
-        fun newInstance(parentFolder: OCFile?, type: Type): ChooseRichDocumentsTemplateDialogFragment {
-            val bundle = Bundle().apply {
-                putParcelable(ARG_PARENT_FOLDER, parentFolder)
-                putString(ARG_TYPE, type.name)
-            }
-
-            return ChooseRichDocumentsTemplateDialogFragment().apply {
-                arguments = bundle
+        fun newInstance(parentFolder: OCFile?, type: Type): ChooseRichDocumentsTemplateDialogFragment =
+            ChooseRichDocumentsTemplateDialogFragment().apply {
+                arguments = Bundle().apply {
+                    putParcelable(ARG_PARENT_FOLDER, parentFolder)
+                    putString(ARG_TYPE, type.name)
+                }
             }
-        }
     }
 }

From 8020f4e7165202ac1375a4dd0115491914424b86 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 15:57:34 +0200
Subject: [PATCH 5/8] simplify file creation from template

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 54 +++++++++----------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index 263eec021c79..24636223668f 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -358,26 +358,26 @@ class ChooseRichDocumentsTemplateDialogFragment :
     }
 
     private suspend fun createFileFromTemplate(template: Template, path: String, user: User) = withContext(Dispatchers.IO) {
-        val result = CreateFileFromTemplateOperation(path, template.id).execute(client)
-        if (!result.isSuccess) {
-            return@withContext
-        }
-
-        // get file
-        val newFileResult = ReadFileRemoteOperation(path).execute(client)
-        if (!newFileResult.isSuccess) {
-            return@withContext
-        }
-
-        val temp = FileStorageUtils.fillOCFile(newFileResult.data[0] as RemoteFile)
-        val storageManager = FileDataStorageManager(
-            user,
-            requireContext().contentResolver
-        )
-        storageManager.saveFile(temp)
+        val url = CreateFileFromTemplateOperation(path, template.id)
+            .execute(client)
+            .takeIf { it.isSuccess }
+            ?.data?.get(0)?.toString()
+            ?: run {
+                showErrorOnMain(R.string.error_creating_file_from_template)
+                return@withContext
+            }
 
-        val file = storageManager.getFileByPath(path)
-        val url = result.data[0].toString()
+        val file = ReadFileRemoteOperation(path)
+            .execute(client)
+            .takeIf { it.isSuccess }
+            ?.data?.get(0)
+            ?.let { FileStorageUtils.fillOCFile(it as RemoteFile) }
+            ?.also { FileDataStorageManager(user, requireContext().contentResolver).saveFile(it) }
+            ?.let { FileDataStorageManager(user, requireContext().contentResolver).getFileByPath(path) }
+            ?: run {
+                showErrorOnMain(R.string.error_creating_file_from_template)
+                return@withContext
+            }
 
         withContext(Dispatchers.Main) {
             if (!isAdded) {
@@ -387,15 +387,6 @@ class ChooseRichDocumentsTemplateDialogFragment :
 
             waitDialog?.dismiss()
 
-            if (url.isEmpty()) {
-                dismiss()
-                DisplayUtils.showSnackMessage(
-                    requireActivity(),
-                    R.string.error_creating_file_from_template
-                )
-                return@withContext
-            }
-
             val intent = Intent(MainApp.getAppContext(), RichDocumentsEditorWebView::class.java).apply {
                 putExtra(ExternalSiteWebView.EXTRA_TITLE, "Collabora")
                 putExtra(ExternalSiteWebView.EXTRA_URL, url)
@@ -409,6 +400,13 @@ class ChooseRichDocumentsTemplateDialogFragment :
         }
     }
 
+    private suspend fun showErrorOnMain(stringRes: Int) = withContext(Dispatchers.Main) {
+        if (!isAdded) return@withContext
+        waitDialog?.dismiss()
+        dismiss()
+        DisplayUtils.showSnackMessage(requireActivity(), stringRes)
+    }
+
     @SuppressLint("SetTextI18n")
     private suspend fun fetchTemplate(type: Type) = withContext(Dispatchers.IO) {
         val client = client ?: return@withContext

From 299c73f6490fef0e7b9277f0ebfca624cbbe87a4 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 15:58:50 +0200
Subject: [PATCH 6/8] simplify file creation from template

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 77 ++++++++++---------
 1 file changed, 41 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index 24636223668f..63993fc3162d 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -357,48 +357,51 @@ class ChooseRichDocumentsTemplateDialogFragment :
         }
     }
 
-    private suspend fun createFileFromTemplate(template: Template, path: String, user: User) = withContext(Dispatchers.IO) {
-        val url = CreateFileFromTemplateOperation(path, template.id)
-            .execute(client)
-            .takeIf { it.isSuccess }
-            ?.data?.get(0)?.toString()
-            ?: run {
-                showErrorOnMain(R.string.error_creating_file_from_template)
-                return@withContext
-            }
+    // region remote operations
+    @Suppress("DEPRECATION")
+    private suspend fun createFileFromTemplate(template: Template, path: String, user: User) =
+        withContext(Dispatchers.IO) {
+            val url = CreateFileFromTemplateOperation(path, template.id)
+                .execute(client)
+                .takeIf { it.isSuccess }
+                ?.data?.get(0)?.toString()
+                ?: run {
+                    showErrorOnMain(R.string.error_creating_file_from_template)
+                    return@withContext
+                }
 
-        val file = ReadFileRemoteOperation(path)
-            .execute(client)
-            .takeIf { it.isSuccess }
-            ?.data?.get(0)
-            ?.let { FileStorageUtils.fillOCFile(it as RemoteFile) }
-            ?.also { FileDataStorageManager(user, requireContext().contentResolver).saveFile(it) }
-            ?.let { FileDataStorageManager(user, requireContext().contentResolver).getFileByPath(path) }
-            ?: run {
-                showErrorOnMain(R.string.error_creating_file_from_template)
-                return@withContext
-            }
+            val file = ReadFileRemoteOperation(path)
+                .execute(client)
+                .takeIf { it.isSuccess }
+                ?.data?.get(0)
+                ?.let { FileStorageUtils.fillOCFile(it as RemoteFile) }
+                ?.also { FileDataStorageManager(user, requireContext().contentResolver).saveFile(it) }
+                ?.let { FileDataStorageManager(user, requireContext().contentResolver).getFileByPath(path) }
+                ?: run {
+                    showErrorOnMain(R.string.error_creating_file_from_template)
+                    return@withContext
+                }
 
-        withContext(Dispatchers.Main) {
-            if (!isAdded) {
-                Log_OC.e(TAG, "Error creating file from template!")
-                return@withContext
-            }
+            withContext(Dispatchers.Main) {
+                if (!isAdded) {
+                    Log_OC.e(TAG, "Error creating file from template!")
+                    return@withContext
+                }
 
-            waitDialog?.dismiss()
+                waitDialog?.dismiss()
 
-            val intent = Intent(MainApp.getAppContext(), RichDocumentsEditorWebView::class.java).apply {
-                putExtra(ExternalSiteWebView.EXTRA_TITLE, "Collabora")
-                putExtra(ExternalSiteWebView.EXTRA_URL, url)
-                putExtra(ExternalSiteWebView.EXTRA_FILE, file)
-                putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false)
-                putExtra(ExternalSiteWebView.EXTRA_TEMPLATE, template)
-            }
+                val intent = Intent(MainApp.getAppContext(), RichDocumentsEditorWebView::class.java).apply {
+                    putExtra(ExternalSiteWebView.EXTRA_TITLE, "Collabora")
+                    putExtra(ExternalSiteWebView.EXTRA_URL, url)
+                    putExtra(ExternalSiteWebView.EXTRA_FILE, file)
+                    putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false)
+                    putExtra(ExternalSiteWebView.EXTRA_TEMPLATE, template)
+                }
 
-            startActivity(intent)
-            dismiss()
+                startActivity(intent)
+                dismiss()
+            }
         }
-    }
 
     private suspend fun showErrorOnMain(stringRes: Int) = withContext(Dispatchers.Main) {
         if (!isAdded) return@withContext
@@ -407,6 +410,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
         DisplayUtils.showSnackMessage(requireActivity(), stringRes)
     }
 
+    @Suppress("DEPRECATION")
     @SuppressLint("SetTextI18n")
     private suspend fun fetchTemplate(type: Type) = withContext(Dispatchers.IO) {
         val client = client ?: return@withContext
@@ -445,6 +449,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
             setTemplateList(templateList)
         }
     }
+    // endregion
 
     companion object {
         private const val ARG_PARENT_FOLDER = "PARENT_FOLDER"

From dce6afa7a1dec2ffdcc7dd7cbf9604b09a0ddf0a Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 16:02:34 +0200
Subject: [PATCH 7/8] simplify check enabling create button

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 70 ++++++++-----------
 1 file changed, 30 insertions(+), 40 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index 63993fc3162d..cde5f2cdb2f0 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -300,62 +300,52 @@ class ChooseRichDocumentsTemplateDialogFragment :
         }
     }
 
-    private fun checkEnablingCreateButton() {
-        if (positiveButton == null) {
-            return
-        }
+    // region filename state
+    private sealed class FilenameState(val isError: Boolean, val errorMessage: CharSequence?) {
+        data object Valid : FilenameState(isError = false, errorMessage = null)
+        data object NoTemplateSelected : FilenameState(isError = false, errorMessage = null)
+        class JustExtension(message: CharSequence) : FilenameState(isError = true, errorMessage = message)
+        class ChangedExtension(message: String) : FilenameState(isError = true, errorMessage = message)
+        class Invalid(message: String) : FilenameState(isError = true, errorMessage = message)
+    }
 
-        val selectedTemplate = adapter?.selectedTemplate
+    private fun resolveFilenameState(): FilenameState {
+        val selectedTemplate = adapter?.selectedTemplate ?: return FilenameState.NoTemplateSelected
         val name = fileNameText
+
         val errorMessage = FileNameValidator.checkFileName(
             name,
             fileDataStorageManager.getCapability(currentAccount.user),
             requireContext(),
             fileNames ?: setOf()
         )
-        val isJustExtension = selectedTemplate != null &&
-            name.equals(DOT + selectedTemplate.extension, ignoreCase = true)
 
-        val isChangedExtension = selectedTemplate != null &&
+        return when {
+            errorMessage != null -> FilenameState.Invalid(errorMessage)
+            name.equals(DOT + selectedTemplate.extension, ignoreCase = true) ->
+                FilenameState.JustExtension(getText(R.string.filename_empty))
             name.contains(DOT) &&
-            name.substringAfterLast(DOT).isNotEmpty() &&
-            name.substringAfterLast(DOT) != selectedTemplate.extension
-
-        val isEnable = selectedTemplate != null && errorMessage == null && !isJustExtension
-
-        positiveButton?.let {
-            it.isEnabled = isEnable
-            it.isClickable = isEnable
-        }
-
-        if (!hasUserInteracted) {
-            return
+                name.substringAfterLast(DOT).isNotEmpty() &&
+                name.substringAfterLast(DOT) != selectedTemplate.extension ->
+                FilenameState.ChangedExtension(getString(R.string.extension_cannot_be_changed))
+            else -> FilenameState.Valid
         }
+    }
 
-        binding.filenameContainer.run {
-            when {
-                errorMessage != null -> {
-                    isErrorEnabled = true
-                    error = errorMessage
-                }
+    private fun checkEnablingCreateButton() {
+        val positiveButton = positiveButton ?: return
+        val state = resolveFilenameState()
 
-                isChangedExtension -> {
-                    isErrorEnabled = true
-                    error = getString(R.string.extension_cannot_be_changed)
-                }
+        val isEnabled = state is FilenameState.Valid
+        positiveButton.isEnabled = isEnabled
+        positiveButton.isClickable = isEnabled
 
-                isJustExtension -> {
-                    isErrorEnabled = true
-                    error = getText(R.string.filename_empty)
-                }
+        if (!hasUserInteracted) return
 
-                else -> {
-                    isErrorEnabled = false
-                    error = null
-                }
-            }
-        }
+        binding.filenameContainer.isErrorEnabled = state.isError
+        binding.filenameContainer.error = state.errorMessage
     }
+    // endregion
 
     // region remote operations
     @Suppress("DEPRECATION")

From 697c1747ae71366cc66a9e27fa260ada55dd70a9 Mon Sep 17 00:00:00 2001
From: alperozturk96 <alper_ozturk@proton.me>
Date: Tue, 16 Jun 2026 16:13:16 +0200
Subject: [PATCH 8/8] simplify

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
---
 ...ooseRichDocumentsTemplateDialogFragment.kt | 89 +++++++++----------
 1 file changed, 40 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
index cde5f2cdb2f0..1afec56af969 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt
@@ -1,7 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
- * SPDX-FileCopyrightText: 2024 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 package com.owncloud.android.ui.dialog
@@ -20,13 +20,12 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.GridLayoutManager
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.common.collect.Sets
 import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.account.User
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.network.ClientFactory
-import com.nextcloud.client.network.ClientFactory.CreationException
 import com.nextcloud.utils.extensions.getParcelableArgument
+import com.nextcloud.utils.extensions.getTypedActivity
 import com.nextcloud.utils.fileNameValidator.FileNameValidator
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
@@ -36,10 +35,10 @@ import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.Template
 import com.owncloud.android.files.CreateFileFromTemplateOperation
 import com.owncloud.android.files.FetchTemplateOperation
-import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.files.ReadFileRemoteOperation
 import com.owncloud.android.lib.resources.files.model.RemoteFile
+import com.owncloud.android.ui.activity.BaseActivity
 import com.owncloud.android.ui.activity.ExternalSiteWebView
 import com.owncloud.android.ui.activity.RichDocumentsEditorWebView
 import com.owncloud.android.ui.adapter.RichDocumentsTemplateAdapter
@@ -54,15 +53,14 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
-/**
- * Dialog to show templates for new documents/spreadsheets/presentations.
- */
+@Suppress("TooManyFunctions")
 class ChooseRichDocumentsTemplateDialogFragment :
     DialogFragment(),
     View.OnClickListener,
     RichDocumentsTemplateAdapter.ClickListener,
     Injectable {
-    private var fileNames: MutableSet<String>? = null
+
+    private var fileNames: Set<String> = emptySet()
     private var hasUserInteracted = false
 
     @Inject
@@ -82,7 +80,6 @@ class ChooseRichDocumentsTemplateDialogFragment :
 
     private var adapter: RichDocumentsTemplateAdapter? = null
     private var parentFolder: OCFile? = null
-    private var client: OwnCloudClient? = null
     private var positiveButton: MaterialButton? = null
     private var waitDialog: DialogFragment? = null
 
@@ -132,7 +129,6 @@ class ChooseRichDocumentsTemplateDialogFragment :
         val arguments = arguments ?: throw IllegalArgumentException("Arguments may not be null")
         val activity = activity ?: throw IllegalArgumentException("Activity may not be null")
 
-        initClient()
         initFilenames(arguments)
         viewThemeUtils.material.colorTextInputLayout(binding.filenameContainer)
 
@@ -150,23 +146,11 @@ class ChooseRichDocumentsTemplateDialogFragment :
         return builder.create()
     }
 
-    @Suppress("DEPRECATION", "TooGenericExceptionThrown")
-    private fun initClient() {
-        try {
-            client = clientFactory.create(currentAccount.user)
-        } catch (e: CreationException) {
-            throw RuntimeException(e)
-        }
-    }
-
     private fun initFilenames(arguments: Bundle) {
         parentFolder = arguments.getParcelableArgument(ARG_PARENT_FOLDER, OCFile::class.java)
-        val folderContent = fileDataStorageManager.getFolderContent(parentFolder, false)
-        fileNames = Sets.newHashSetWithExpectedSize(folderContent.size)
-
-        for (file in folderContent) {
-            fileNames?.add(file.fileName)
-        }
+        fileNames = fileDataStorageManager
+            .getFolderContent(parentFolder, false)
+            .mapTo(HashSet()) { it.fileName }
     }
 
     private fun initList(type: Type) {
@@ -252,28 +236,28 @@ class ChooseRichDocumentsTemplateDialogFragment :
         }
 
     override fun onClick(v: View) {
-        val name = fileNameText
-        val path = parentFolder?.remotePath + name
-
         val selectedTemplate = adapter?.selectedTemplate
+            ?: return DisplayUtils.showSnackMessage(binding.list, R.string.select_one_template)
 
-        val errorMessage = FileNameValidator.checkFileName(
-            name,
-            fileDataStorageManager.getCapability(currentAccount.user),
-            requireContext(),
-            fileNames ?: setOf()
-        )
+        val state = resolveFilenameState()
+        when (state) {
+            is FilenameState.Invalid ->
+                DisplayUtils.showSnackMessage(requireActivity(), state.errorMessage)
+
+            is FilenameState.JustExtension ->
+                DisplayUtils.showSnackMessage(binding.list, R.string.enter_filename)
+
+            is FilenameState.Valid -> {
+                val name = fileNameText
+                val path = parentFolder?.remotePath + name
+                if (!name.endsWith(selectedTemplate.extension)) {
+                    createFromTemplate(selectedTemplate, path + DOT + selectedTemplate.extension)
+                } else {
+                    createFromTemplate(selectedTemplate, path)
+                }
+            }
 
-        if (selectedTemplate == null) {
-            DisplayUtils.showSnackMessage(binding.list, R.string.select_one_template)
-        } else if (errorMessage != null) {
-            DisplayUtils.showSnackMessage(requireActivity(), errorMessage)
-        } else if (name.equals(DOT + selectedTemplate.extension, ignoreCase = true)) {
-            DisplayUtils.showSnackMessage(binding.list, R.string.enter_filename)
-        } else if (!name.endsWith(selectedTemplate.extension)) {
-            createFromTemplate(selectedTemplate, path + DOT + selectedTemplate.extension)
-        } else {
-            createFromTemplate(selectedTemplate, path)
+            else -> Unit
         }
     }
 
@@ -294,17 +278,17 @@ class ChooseRichDocumentsTemplateDialogFragment :
             binding.filename.setText(String.format("%s.%s", template.name, template.extension))
         }
 
-        val dotIndex = fileNameText.lastIndexOf('.')
+        val dotIndex = binding.filename.text?.lastIndexOf('.') ?: -1
         if (dotIndex >= 0) {
             binding.filename.setSelection(dotIndex)
         }
     }
 
     // region filename state
-    private sealed class FilenameState(val isError: Boolean, val errorMessage: CharSequence?) {
+    private sealed class FilenameState(val isError: Boolean, val errorMessage: String?) {
         data object Valid : FilenameState(isError = false, errorMessage = null)
         data object NoTemplateSelected : FilenameState(isError = false, errorMessage = null)
-        class JustExtension(message: CharSequence) : FilenameState(isError = true, errorMessage = message)
+        class JustExtension(message: String) : FilenameState(isError = true, errorMessage = message)
         class ChangedExtension(message: String) : FilenameState(isError = true, errorMessage = message)
         class Invalid(message: String) : FilenameState(isError = true, errorMessage = message)
     }
@@ -322,12 +306,15 @@ class ChooseRichDocumentsTemplateDialogFragment :
 
         return when {
             errorMessage != null -> FilenameState.Invalid(errorMessage)
+
             name.equals(DOT + selectedTemplate.extension, ignoreCase = true) ->
-                FilenameState.JustExtension(getText(R.string.filename_empty))
+                FilenameState.JustExtension(getString(R.string.filename_empty))
+
             name.contains(DOT) &&
                 name.substringAfterLast(DOT).isNotEmpty() &&
                 name.substringAfterLast(DOT) != selectedTemplate.extension ->
                 FilenameState.ChangedExtension(getString(R.string.extension_cannot_be_changed))
+
             else -> FilenameState.Valid
         }
     }
@@ -351,6 +338,9 @@ class ChooseRichDocumentsTemplateDialogFragment :
     @Suppress("DEPRECATION")
     private suspend fun createFileFromTemplate(template: Template, path: String, user: User) =
         withContext(Dispatchers.IO) {
+            val activity = getTypedActivity(BaseActivity::class.java)
+            val client = activity?.clientRepository?.getOwncloudClient() ?: return@withContext
+
             val url = CreateFileFromTemplateOperation(path, template.id)
                 .execute(client)
                 .takeIf { it.isSuccess }
@@ -403,7 +393,8 @@ class ChooseRichDocumentsTemplateDialogFragment :
     @Suppress("DEPRECATION")
     @SuppressLint("SetTextI18n")
     private suspend fun fetchTemplate(type: Type) = withContext(Dispatchers.IO) {
-        val client = client ?: return@withContext
+        val activity = getTypedActivity(BaseActivity::class.java)
+        val client = activity?.clientRepository?.getOwncloudClient() ?: return@withContext
 
         val templateList = FetchTemplateOperation(type)
             .execute(client)