Open in web editor

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

Author: alperozturk96

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

@@ -353,12 +353,12 @@ class FileMenuFilterIT : AbstractIT() {
                 val downloadedToHide = filterFactory
                     .newInstance(downloadedFile, mockComponentsGetter, true, user)
                     .getToHide(false)
-                assertFalse(downloadedToHide.contains(R.id.action_open_with_office))
+                assertFalse(downloadedToHide.contains(R.id.action_open_in_web_editor))
 
                 val onlineToHide = filterFactory
                     .newInstance(onlineOnlyFile, mockComponentsGetter, true, user)
                     .getToHide(false)
-                assertTrue(onlineToHide.contains(R.id.action_open_with_office))
+                assertTrue(onlineToHide.contains(R.id.action_open_in_web_editor))
             }
         }
     }

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

@@ -48,7 +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),
+    OPEN_WITH_OFFICE(R.id.action_open_in_web_editor, R.string.action_open_in_web_editor, 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),
 

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

@@ -348,14 +348,14 @@ private void filterOpenWith(Collection<Integer> toHide, boolean synchronizing) {
 
     private void filterOpenWithOffice(Collection<Integer> toHide) {
         if (!isSingleFile()) {
-            toHide.add(R.id.action_open_with_office);
+            toHide.add(R.id.action_open_in_web_editor);
             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);
+            toHide.add(R.id.action_open_in_web_editor);
         }
     }
 

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

@@ -9,13 +9,16 @@
 package com.owncloud.android.ui.activity
 
 import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
 import androidx.core.net.toUri
 import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebViewFeature
 import com.nextcloud.android.common.ui.util.PlatformThemeUtil
 import com.nextcloud.client.appinfo.AppInfo
 import com.nextcloud.client.device.DeviceInfo
 import com.owncloud.android.R
+import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.ui.asynctasks.TextEditorLoadUrlTask
 import com.owncloud.android.utils.DisplayUtils
 import javax.inject.Inject
@@ -27,6 +30,21 @@ class TextEditorWebView : EditorWebView() {
     @Inject
     lateinit var deviceInfo: DeviceInfo
 
+    companion object {
+        fun startTextEditor(file: OCFile?, context: Context?) {
+            val context = context ?: return
+            val file = file ?: return
+
+            Intent(context, TextEditorWebView::class.java).apply {
+                putExtra(EXTRA_TITLE, "Text")
+                putExtra(EXTRA_FILE, file)
+                putExtra(EXTRA_SHOW_SIDEBAR, false)
+            }.also {
+                context.startActivity(it)
+            }
+        }
+    }
+
     @SuppressLint("AddJavascriptInterface") // suppress warning as webview is only used > Lollipop
     override fun postOnCreate() {
         super.postOnCreate()
@@ -37,7 +55,7 @@ class TextEditorWebView : EditorWebView() {
         }
 
         user.ifPresent {
-            val editor = editorUtils.getEditor(it, file?.mimeType)
+            val editor = editorUtils.getAvailableEditor(it, file?.mimeType)
 
             if (editorUtils.usesOfficeUserAgent(editor)) {
                 webView.settings.userAgentString = generateOfficeUserAgent()

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

@@ -1355,7 +1355,7 @@ 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) {
+            } else if (itemId == R.id.action_open_in_web_editor) {
                 TextEditorWebView.Companion.startTextEditor(singleFile, getContext());
                 return true;
             } else if (itemId == R.id.action_stream_media) {

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

@@ -23,7 +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_open_in_web_editor" 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,7 +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="action_open_in_web_editor">Open in web editor</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>