Skip to content

Commit f1251f0

Browse files
committed
fix spotbugs
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 104c6ae commit f1251f0

3 files changed

Lines changed: 8 additions & 15 deletions

File tree

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
import com.owncloud.android.ui.activity.FileDisplayActivity;
9292
import com.owncloud.android.ui.activity.FolderPickerActivity;
9393
import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
94+
import com.owncloud.android.ui.activity.TextEditorWebView;
9495
import com.owncloud.android.ui.activity.UploadFilesActivity;
9596
import com.owncloud.android.ui.adapter.CommonOCFileListAdapterInterface;
9697
import com.owncloud.android.ui.adapter.OCFileListAdapter;
@@ -1220,7 +1221,7 @@ private void handlePendingDownloadFile(OCFile file) {
12201221
setFabVisible(false);
12211222
fda.startMediaPreview(file, 0, true, true, true, true);
12221223
} else if (editorUtils.getEditor(accountManager.getUser(), file.getMimeType()) != null && !file.isEncrypted()) {
1223-
mContainerActivity.getFileOperationsHelper().openFileWithTextEditor(file, getContext());
1224+
TextEditorWebView.Companion.startTextEditor(file, getContext());
12241225
} else if (capability.getRichDocumentsMimeTypeList() != null &&
12251226
capability.getRichDocumentsMimeTypeList().contains(file.getMimeType()) &&
12261227
capability.getRichDocumentsDirectEditing().isTrue() && !file.isEncrypted()) {
@@ -1355,16 +1356,15 @@ public boolean onFileActionChosen(@IdRes final int itemId, Set<OCFile> checkedFi
13551356
mContainerActivity.getFileOperationsHelper().openFile(singleFile);
13561357
return true;
13571358
} else if (itemId == R.id.action_open_with_office) {
1358-
mContainerActivity.getFileOperationsHelper().openFileWithTextEditor(singleFile, getContext());
1359+
TextEditorWebView.Companion.startTextEditor(singleFile, getContext());
13591360
return true;
13601361
} else if (itemId == R.id.action_stream_media) {
13611362
mContainerActivity.getFileOperationsHelper().streamMediaFile(singleFile);
13621363
return true;
13631364
} else if (itemId == R.id.action_edit) {
13641365
// should not be necessary, as menu item is filtered, but better play safe
1365-
if (editorUtils.isEditorAvailable(accountManager.getUser(),
1366-
singleFile.getMimeType())) {
1367-
mContainerActivity.getFileOperationsHelper().openFileWithTextEditor(singleFile, getContext());
1366+
if (editorUtils.isEditorAvailable(accountManager.getUser(), singleFile.getMimeType())) {
1367+
TextEditorWebView.Companion.startTextEditor(singleFile,getContext());
13681368
} else if (EditImageActivity.Companion.canBePreviewed(singleFile)) {
13691369
((FileDisplayActivity) mContainerActivity).startImageEditor(singleFile);
13701370
} else {

app/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ public void openFile(OCFile file) {
296296
Optional<User> optionalUser = fileActivity.getUser();
297297

298298
if (optionalUser.isPresent() && editorUtils.isEditorAvailable(optionalUser.get(), file.getMimeType())) {
299-
openFileWithTextEditor(file, fileActivity);
299+
TextEditorWebView.Companion.startTextEditor(file, fileActivity);
300300
return;
301301
}
302302

@@ -365,14 +365,6 @@ public void openFileAsRichDocument(OCFile file, Context context) {
365365
context.startActivity(collaboraWebViewIntent);
366366
}
367367

368-
public void openFileWithTextEditor(OCFile file, Context context) {
369-
Intent textEditorIntent = new Intent(context, TextEditorWebView.class);
370-
textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, "Text");
371-
textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_FILE, file);
372-
textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
373-
context.startActivity(textEditorIntent);
374-
}
375-
376368
public void openRichWorkspaceWithTextEditor(OCFile file, String url, Context context) {
377369
Intent textEditorIntent = new Intent(context, TextEditorWebView.class);
378370
textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, "Text");

app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.owncloud.android.datamodel.OCFile;
2828
import com.owncloud.android.lib.common.utils.Log_OC;
2929
import com.owncloud.android.ui.activity.FileActivity;
30+
import com.owncloud.android.ui.activity.TextEditorWebView;
3031
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
3132
import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
3233
import com.owncloud.android.utils.DisplayUtils;
@@ -310,7 +311,7 @@ private void onFileActionChosen(final int itemId) {
310311
} else if(itemId == R.id.action_cancel_sync){
311312
containerActivity.getFileOperationsHelper().cancelTransference(getFile());
312313
} else if (itemId == R.id.action_edit) {
313-
containerActivity.getFileOperationsHelper().openFileWithTextEditor(getFile(), getContext());
314+
TextEditorWebView.Companion.startTextEditor(getFile(), getContext());
314315
}
315316
}
316317

0 commit comments

Comments
 (0)