wip

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

# Conflicts:
#	app/src/main/java/com/owncloud/android/ui/activity/TextEditorWebView.kt

Author: alperozturk96

app/src/androidTest/java/com/owncloud/android/files/FileMenuFilterIT.kt

@@ -330,6 +330,39 @@ class FileMenuFilterIT : AbstractIT() {
         }
     }
 
+    @Test
+    fun filter_openWithOnlyOffice_onlyForDownloadedFiles() {
+        every {
+            mockArbitraryDataProvider.getValue(any<User>(), ArbitraryDataProvider.DIRECT_EDITING)
+        } returns ONLYOFFICE_DIRECT_EDITING_JSON
+
+        configureCapability(OCCapability())
+
+        val downloadedFile = OCFile("/downloaded.docx").apply {
+            mimeType = OFFICE_MIMETYPE
+            storagePath = getDummyFile("downloaded.docx").absolutePath
+        }
+        val onlineOnlyFile = OCFile("/online.docx").apply {
+            mimeType = OFFICE_MIMETYPE
+        }
+
+        launchActivity<TestActivity>().use {
+            it.onActivity { activity ->
+                val filterFactory = FileMenuFilter.Factory(mockStorageManager, activity, editorUtils)
+
+                val downloadedToHide = filterFactory
+                    .newInstance(downloadedFile, mockComponentsGetter, true, user)
+                    .getToHide(false)
+                assertFalse(downloadedToHide.contains(R.id.action_open_with_office))
+
+                val onlineToHide = filterFactory
+                    .newInstance(onlineOnlyFile, mockComponentsGetter, true, user)
+                    .getToHide(false)
+                assertTrue(onlineToHide.contains(R.id.action_open_with_office))
+            }
+        }
+    }
+
     private data class ExpectedLockVisibilities(val lockFile: Boolean, val unlockFile: Boolean)
 
     private fun configureCapability(capability: OCCapability) {
@@ -363,4 +396,25 @@ class FileMenuFilterIT : AbstractIT() {
             }
         }
     }
+
+    companion object {
+        private const val OFFICE_MIMETYPE =
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+
+        private val ONLYOFFICE_DIRECT_EDITING_JSON =
+            """
+            {
+              "editors": {
+                "onlyoffice": {
+                  "id": "onlyoffice",
+                  "name": "OnlyOffice",
+                  "mimetypes": [],
+                  "optionalMimetypes": ["$OFFICE_MIMETYPE"],
+                  "secure": false
+                }
+              },
+              "creators": {}
+            }
+            """.trimIndent()
+    }
 }

app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt

@@ -48,6 +48,7 @@ enum class FileAction(
     SEND_SHARE_FILE(R.id.action_send_share_file, R.string.action_send_share, R.drawable.ic_share),
     SEND_FILE(R.id.action_send_file, R.string.common_send, R.drawable.ic_share),
     OPEN_FILE_WITH(R.id.action_open_file_with, R.string.actionbar_open_with, R.drawable.ic_external),
+    OPEN_WITH_OFFICE(R.id.action_open_with_office, R.string.action_open_with_office, R.drawable.file_doc),
     STREAM_MEDIA(R.id.action_stream_media, R.string.stream, R.drawable.ic_play_arrow),
     SET_AS_WALLPAPER(R.id.action_set_as_wallpaper, R.string.set_picture_as, R.drawable.ic_wallpaper),
 
@@ -87,6 +88,7 @@ enum class FileAction(
                 SEND_SHARE_FILE,
                 SEND_FILE,
                 OPEN_FILE_WITH,
+                OPEN_WITH_OFFICE,
                 SYNC_FOLDER
             )
 

app/src/main/java/com/nextcloud/utils/EditorUtils.kt

@@ -18,19 +18,34 @@ import javax.inject.Inject
 class EditorUtils @Inject constructor(private val arbitraryDataProvider: ArbitraryDataProvider) {
 
     /**
-     * Returns only supported mimetypes
+     * Returns an editor matching only the strictly supported mimetypes.
      */
     fun getEditor(user: User?, mimeType: String?): Editor? {
         val editors = getEditors(user) ?: return null
         return editors.firstOrNull { mimeType in it.mimetypes }
     }
 
+    /**
+     * Returns an editor matching the supported mimetypes or, as a fallback, the optional ones.
+     */
+    fun getAvailableEditor(user: User?, mimeType: String?): Editor? {
+        val editors = getEditors(user) ?: return null
+        return editors.firstOrNull { mimeType in it.mimetypes }
+            ?: editors.firstOrNull { mimeType in it.optionalMimetypes }
+    }
+
     /**
      * Returns supported mimetypes along with optional ones
      */
-    fun isEditorAvailable(user: User?, mimeType: String?): Boolean {
+    fun isEditorAvailable(user: User?, mimeType: String?): Boolean = getAvailableEditor(user, mimeType) != null
+
+    /**
+     * Returns true when an office editor (e.g. OnlyOffice) can open the mimetype,
+     * either as a supported or optional mimetype.
+     */
+    fun isOfficeEditorAvailable(user: User?, mimeType: String?): Boolean {
         val editors = getEditors(user) ?: return false
-        return editors.any { mimeType in it.mimetypes || mimeType in it.optionalMimetypes }
+        return editors.any { usesOfficeUserAgent(it) && (mimeType in it.mimetypes || mimeType in it.optionalMimetypes) }
     }
 
     private fun getEditors(user: User?): Collection<Editor>? {

app/src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -158,6 +158,7 @@ private List<Integer> filter(boolean inSingleFileFragment) {
         filterSelectAll(toHide, inSingleFileFragment);
         filterDeselectAll(toHide, inSingleFileFragment);
         filterOpenWith(toHide, synchronizing);
+        filterOpenWithOffice(toHide);
         filterCancelSync(toHide, synchronizing);
         filterSync(toHide, synchronizing);
         filterShareFile(toHide, capability);
@@ -339,6 +340,19 @@ private void filterOpenWith(Collection<Integer> toHide, boolean synchronizing) {
         }
     }
 
+    private void filterOpenWithOffice(Collection<Integer> toHide) {
+        if (!isSingleFile()) {
+            toHide.add(R.id.action_open_with_office);
+            return;
+        }
+
+        OCFile file = files.iterator().next();
+        boolean canOpenLocally = file.isDown() && !file.isEncrypted();
+        if (!canOpenLocally || !editorUtils.isOfficeEditorAvailable(user, file.getMimeType())) {
+            toHide.add(R.id.action_open_with_office);
+        }
+    }
+
     private void filterDeselectAll(List<Integer> toHide, boolean inSingleFileFragment) {
         if (inSingleFileFragment) {
             // Always hide in single file fragments

app/src/main/java/com/owncloud/android/ui/asynctasks/TextEditorLoadUrlTask.java

@@ -41,7 +41,7 @@ protected String doInBackground(Void... voids) {
             return "";
         }
 
-        Editor editor = editorUtils.getEditor(user, file.getMimeType());
+        Editor editor = editorUtils.getAvailableEditor(user, file.getMimeType());
 
         if (editor == null) {
             return "";

app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -148,7 +148,6 @@
 import androidx.fragment.app.FragmentManager;
 import androidx.media3.common.util.UnstableApi;
 import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 
 import static com.owncloud.android.datamodel.OCFile.ROOT_PATH;
 import static com.owncloud.android.ui.dialog.setupEncryption.SetupEncryptionDialogFragment.SETUP_ENCRYPTION_DIALOG_TAG;
@@ -1355,6 +1354,9 @@ public boolean onFileActionChosen(@IdRes final int itemId, Set<OCFile> checkedFi
             } else if (itemId == R.id.action_open_file_with) {
                 mContainerActivity.getFileOperationsHelper().openFile(singleFile);
                 return true;
+            } else if (itemId == R.id.action_open_with_office) {
+                mContainerActivity.getFileOperationsHelper().openFileWithTextEditor(singleFile, getContext());
+                return true;
             } else if (itemId == R.id.action_stream_media) {
                 mContainerActivity.getFileOperationsHelper().streamMediaFile(singleFile);
                 return true;

app/src/main/res/values/ids.xml

@@ -23,6 +23,7 @@
     <item name="action_send_share_file" type="id"/>
     <item name="action_send_file" type="id"/>
     <item name="action_open_file_with" type="id"/>
+    <item name="action_open_with_office" type="id"/>
     <item name="action_sync_file" type="id"/>
     <item name="action_sync_all_files" type="id"/>
     <item name="action_cancel_sync" type="id"/>

app/src/main/res/values/strings.xml

@@ -1194,6 +1194,7 @@
     <string name="share_internal_link_to_file_text">Internal share link only works for users with access to this file</string>
     <string name="share_internal_link">Share internal link</string>
     <string name="action_edit">Edit</string>
+    <string name="action_open_with_office">Open with office</string>
     <string name="failed_to_start_editor">Failed to start editor</string>
     <string name="create_rich_workspace">Add folder description</string>
     <string name="uploader_file_not_found_on_server_message">We couldnt locate the file on server. Another user may have deleted the file</string>