checkedFiles = new HashSet<>();
checkedFiles.add(file);
- return onFileActionChosen(item.getItemId(), checkedFiles);
+ return onFileActionChosen(item, checkedFiles);
});
popup.show();
}
@@ -506,6 +500,11 @@ public void newPresentation() {
.show(requireActivity().getSupportFragmentManager(), DIALOG_CREATE_DOCUMENT);
}
+ @Override
+ public void onHeaderClicked() {
+ ((FileDisplayActivity) mContainerActivity).startRichWorkspacePreview(getCurrentFile());
+ }
+
/**
* Handler for multiple selection mode.
*
@@ -635,7 +634,7 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
Set checkedFiles = mAdapter.getCheckedItems();
- return onFileActionChosen(item.getItemId(), checkedFiles);
+ return onFileActionChosen(item, checkedFiles);
}
/**
@@ -713,7 +712,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
}
@Override
- public void onPrepareOptionsMenu(Menu menu) {
+ public void onPrepareOptionsMenu(@NonNull Menu menu) {
Menu mMenu = menu;
if (mOriginalMenuItems.size() == 0) {
@@ -935,7 +934,7 @@ public void onItemClicked(OCFile file) {
}
} else if (file.isDown() && MimeTypeUtil.isVCard(file)) {
((FileDisplayActivity) mContainerActivity).startContactListFragment(file);
- } else if (PreviewTextFragment.canBePreviewed(file)) {
+ } else if (PreviewTextFileFragment.canBePreviewed(file)) {
((FileDisplayActivity) mContainerActivity).startTextPreview(file, false);
} else if (file.isDown()) {
if (PreviewMediaFragment.canBePreviewed(file)) {
@@ -945,6 +944,7 @@ public void onItemClicked(OCFile file) {
mContainerActivity.getFileOperationsHelper().openFile(file);
}
} else {
+ // file not downloaded, check for streaming, remote editing
User account = accountManager.getUser();
OCCapability capability = mContainerActivity.getStorageManager()
.getCapability(account.getAccountName());
@@ -953,8 +953,13 @@ public void onItemClicked(OCFile file) {
.isMediaStreamingSupported()) {
// stream media preview on >= NC14
((FileDisplayActivity) mContainerActivity).startMediaPreview(file, 0, true, true, true);
+ } else if (FileMenuFilter.isEditorAvailable(requireContext().getContentResolver(),
+ account.toPlatformAccount(),
+ file.getMimeType()) &&
+ android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ mContainerActivity.getFileOperationsHelper().openFileWithTextEditor(file, getContext());
} else if (capability.getRichDocumentsMimeTypeList().contains(file.getMimeType()) &&
- android.os.Build.VERSION.SDK_INT >= RichDocumentsWebView.MINIMUM_API &&
+ android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
capability.getRichDocumentsDirectEditing().isTrue()) {
mContainerActivity.getFileOperationsHelper().openFileAsRichDocument(file, getContext());
} else {
@@ -993,11 +998,11 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
/**
* Start the appropriate action(s) on the currently selected files given menu selected by the user.
*
- * @param menuId Identifier of the action menu selected by the user
+ * @param item MenuItem selected by the user
* @param checkedFiles List of files selected by the user on which the action should be performed
* @return 'true' if the menu selection started any action, 'false' otherwise.
*/
- public boolean onFileActionChosen(int menuId, Set checkedFiles) {
+ public boolean onFileActionChosen(MenuItem item, Set checkedFiles) {
if (checkedFiles.isEmpty()) {
return false;
}
@@ -1005,7 +1010,7 @@ public boolean onFileActionChosen(int menuId, Set checkedFiles) {
if (checkedFiles.size() == SINGLE_SELECTION) {
/// action only possible on a single file
OCFile singleFile = checkedFiles.iterator().next();
- switch (menuId) {
+ switch (item.getItemId()) {
case R.id.action_send_share_file: {
mContainerActivity.getFileOperationsHelper().sendShareFile(singleFile);
return true;
@@ -1018,9 +1023,27 @@ public boolean onFileActionChosen(int menuId, Set checkedFiles) {
mContainerActivity.getFileOperationsHelper().streamMediaFile(singleFile);
return true;
}
- case R.id.action_open_file_as_richdocument: {
- mContainerActivity.getFileOperationsHelper().openFileAsRichDocument(singleFile, getContext());
- return true;
+ case R.id.action_edit: {
+ Account account = ((FileActivity) mContainerActivity).getUserAccountManager()
+ .getUser().toPlatformAccount();
+
+ // should not be necessary, as menu item is filtered, but better play safe
+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+ if (FileMenuFilter.isEditorAvailable(requireContext().getContentResolver(),
+ account,
+ singleFile.getMimeType())) {
+ mContainerActivity.getFileOperationsHelper().openFileWithTextEditor(singleFile,
+ getContext());
+ } else {
+ mContainerActivity.getFileOperationsHelper().openFileAsRichDocument(singleFile,
+ getContext());
+ }
+
+ return true;
+ } else {
+ DisplayUtils.showSnackMessage(getView(), "Not supported on older than Android 5");
+ return false;
+ }
}
case R.id.action_rename_file: {
RenameFileDialogFragment dialog = RenameFileDialogFragment.newInstance(singleFile);
@@ -1050,7 +1073,7 @@ public boolean onFileActionChosen(int menuId, Set checkedFiles) {
}
/// actions possible on a batch of files
- switch (menuId) {
+ switch (item.getItemId()) {
case R.id.action_remove_file: {
RemoveFilesDialogFragment dialog = RemoveFilesDialogFragment.newInstance(new ArrayList<>(checkedFiles), mActiveActionMode);
dialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION);
diff --git a/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java b/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
index 387125c67c72..ef720682c05d 100755
--- a/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
+++ b/src/main/java/com/owncloud/android/ui/helpers/FileOperationsHelper.java
@@ -67,8 +67,9 @@
import com.owncloud.android.ui.activity.ConflictsResolveActivity;
import com.owncloud.android.ui.activity.ExternalSiteWebView;
import com.owncloud.android.ui.activity.FileActivity;
-import com.owncloud.android.ui.activity.RichDocumentsWebView;
+import com.owncloud.android.ui.activity.RichDocumentsEditorWebView;
import com.owncloud.android.ui.activity.ShareActivity;
+import com.owncloud.android.ui.activity.TextEditorWebView;
import com.owncloud.android.ui.dialog.SendShareDialog;
import com.owncloud.android.ui.events.EncryptionEvent;
import com.owncloud.android.ui.events.FavoriteEvent;
@@ -98,6 +99,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
import androidx.core.content.FileProvider;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
@@ -278,7 +280,7 @@ public void openFile(OCFile file) {
Account account = fileActivity.getAccount();
OCCapability capability = fileActivity.getStorageManager().getCapability(account.name);
if (capability.getRichDocumentsMimeTypeList().contains(file.getMimeType()) &&
- android.os.Build.VERSION.SDK_INT >= RichDocumentsWebView.MINIMUM_API &&
+ android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
capability.getRichDocumentsDirectEditing().isTrue()) {
openFileAsRichDocument(file, fileActivity);
return;
@@ -341,14 +343,33 @@ public void run() {
}
}
+ @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public void openFileAsRichDocument(OCFile file, Context context) {
- Intent collaboraWebViewIntent = new Intent(context, RichDocumentsWebView.class);
+ Intent collaboraWebViewIntent = new Intent(context, RichDocumentsEditorWebView.class);
collaboraWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, "Collabora");
collaboraWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_FILE, file);
collaboraWebViewIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
context.startActivity(collaboraWebViewIntent);
}
+ @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+ public void openFileWithTextEditor(OCFile file, Context context) {
+ Intent textEditorIntent = new Intent(context, TextEditorWebView.class);
+ textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, "Text");
+ textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_FILE, file);
+ textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
+ context.startActivity(textEditorIntent);
+ }
+
+ public void openRichWorkspaceWithTextEditor(OCFile file, String url, Context context) {
+ Intent textEditorIntent = new Intent(context, TextEditorWebView.class);
+ textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_TITLE, "Text");
+ textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_URL, url);
+ textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_FILE, file);
+ textEditorIntent.putExtra(ExternalSiteWebView.EXTRA_SHOW_SIDEBAR, false);
+ context.startActivity(textEditorIntent);
+ }
+
@NonNull
private Intent createOpenFileIntent(OCFile file) {
String storagePath = file.getStoragePath();
diff --git a/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java b/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
index e4fe44d4875d..5b2fd546d57f 100644
--- a/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
+++ b/src/main/java/com/owncloud/android/ui/interfaces/OCFileListFragmentInterface.java
@@ -46,4 +46,6 @@ public interface OCFileListFragmentInterface {
boolean onLongItemClicked(OCFile file);
boolean isLoading();
+
+ void onHeaderClicked();
}
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java
new file mode 100644
index 000000000000..cbed5ebef449
--- /dev/null
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java
@@ -0,0 +1,390 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2019 Tobias Kaminsky
+ * Copyright (C) 2019 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package com.owncloud.android.ui.preview;
+
+import android.accounts.Account;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.TextView;
+
+import com.nextcloud.client.account.UserAccountManager;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.files.FileMenuFilter;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
+import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
+import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.MimeTypeUtil;
+
+import org.jetbrains.annotations.NotNull;
+import org.mozilla.universalchardet.ReaderFactory;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.lang.ref.WeakReference;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Scanner;
+
+import javax.inject.Inject;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+
+public class PreviewTextFileFragment extends PreviewTextFragment {
+ private static final String EXTRA_FILE = "FILE";
+ private static final String EXTRA_ACCOUNT = "ACCOUNT";
+ private static final String TAG = PreviewTextFileFragment.class.getSimpleName();
+
+ private TextLoadAsyncTask textLoadAsyncTask;
+ private Account account;
+
+ @Inject UserAccountManager accountManager;
+
+ /**
+ * Creates an empty fragment for previews.
+ *
+ * MUST BE KEPT: the system uses it when tries to re-instantiate a fragment automatically (for instance, when the
+ * device is turned a aside).
+ *
+ * DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful construction
+ */
+ public PreviewTextFileFragment() {
+ super();
+ account = null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setHasOptionsMenu(true);
+
+ OCFile file = getFile();
+
+ Bundle args = getArguments();
+
+ if (file == null) {
+ file = args.getParcelable(FileDisplayActivity.EXTRA_FILE);
+ }
+
+ if (account == null) {
+ account = args.getParcelable(FileDisplayActivity.EXTRA_ACCOUNT);
+ }
+
+ if (args.containsKey(FileDisplayActivity.EXTRA_SEARCH_QUERY)) {
+ mSearchQuery = args.getString(FileDisplayActivity.EXTRA_SEARCH_QUERY);
+ }
+ mSearchOpen = args.getBoolean(FileDisplayActivity.EXTRA_SEARCH, false);
+
+ if (savedInstanceState == null) {
+ if (file == null) {
+ throw new IllegalStateException("Instanced with a NULL OCFile");
+ }
+ if (account == null) {
+ throw new IllegalStateException("Instanced with a NULL ownCloud Account");
+ }
+ } else {
+ file = savedInstanceState.getParcelable(EXTRA_FILE);
+ account = savedInstanceState.getParcelable(EXTRA_ACCOUNT);
+ }
+
+ mHandler = new Handler();
+ setFile(file);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onSaveInstanceState(@NonNull Bundle outState) {
+ outState.putParcelable(PreviewTextFileFragment.EXTRA_FILE, getFile());
+ outState.putParcelable(PreviewTextFileFragment.EXTRA_ACCOUNT, account);
+
+ super.onSaveInstanceState(outState);
+ }
+
+ @Override
+ void loadAndShowTextPreview() {
+ textLoadAsyncTask = new TextLoadAsyncTask(new WeakReference<>(mTextPreview));
+ textLoadAsyncTask.execute(getFile().getStoragePath());
+ }
+
+ /**
+ * Reads the file to preview and shows its contents. Too critical to be anonymous.
+ */
+ private class TextLoadAsyncTask extends AsyncTask {
+ private static final int PARAMS_LENGTH = 1;
+ private final WeakReference mTextViewReference;
+
+ private TextLoadAsyncTask(WeakReference textView) {
+ mTextViewReference = textView;
+ }
+
+ @Override
+ protected void onPreExecute() {
+ // not used at the moment
+ }
+
+ @Override
+ protected StringWriter doInBackground(Object... params) {
+ if (params.length != PARAMS_LENGTH) {
+ throw new IllegalArgumentException("The parameter to " + TextLoadAsyncTask.class.getName()
+ + " must be (1) the file location");
+ }
+ String location = (String) params[0];
+
+ Scanner scanner = null;
+ StringWriter source = new StringWriter();
+ BufferedWriter bufferedWriter = new BufferedWriter(source);
+ Reader reader = null;
+
+ try {
+ File file = new File(location);
+ reader = ReaderFactory.createReaderFromFile(file);
+ scanner = new Scanner(reader);
+
+ while (scanner.hasNextLine()) {
+ bufferedWriter.append(scanner.nextLine());
+ if (scanner.hasNextLine()) {
+ bufferedWriter.append("\n");
+ }
+ }
+ bufferedWriter.close();
+ IOException exc = scanner.ioException();
+ if (exc != null) {
+ throw exc;
+ }
+ } catch (IOException e) {
+ Log_OC.e(TAG, e.getMessage(), e);
+ finish();
+ } finally {
+ if (reader != null) {
+ try {
+ reader.close();
+ } catch (IOException e) {
+ Log_OC.e(TAG, e.getMessage(), e);
+ finish();
+ }
+ }
+ if (scanner != null) {
+ scanner.close();
+ }
+ }
+ return source;
+ }
+
+ @Override
+ protected void onPostExecute(final StringWriter stringWriter) {
+ final TextView textView = mTextViewReference.get();
+
+ if (textView != null) {
+ mOriginalText = stringWriter.toString();
+ mSearchView.setOnQueryTextListener(PreviewTextFileFragment.this);
+
+ setText(textView, mOriginalText, getContext());
+
+ if (mSearchOpen) {
+ mSearchView.setQuery(mSearchQuery, true);
+ }
+ textView.setVisibility(View.VISIBLE);
+ }
+
+ if (mMultiView != null) {
+ mMultiView.setVisibility(View.GONE);
+ }
+
+ }
+
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
+ super.onCreateOptionsMenu(menu, inflater);
+ inflater.inflate(R.menu.item_file, menu);
+
+ MenuItem menuItem = menu.findItem(R.id.action_search);
+ menuItem.setVisible(true);
+ mSearchView = (SearchView) MenuItemCompat.getActionView(menuItem);
+ mSearchView.setMaxWidth(Integer.MAX_VALUE);
+
+ if (mSearchOpen) {
+ mSearchView.setIconified(false);
+ mSearchView.setQuery(mSearchQuery, false);
+ mSearchView.clearFocus();
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onPrepareOptionsMenu(@NotNull Menu menu) {
+ super.onPrepareOptionsMenu(menu);
+
+ if (containerActivity.getStorageManager() != null) {
+ Account currentAccount = containerActivity.getStorageManager().getAccount();
+ FileMenuFilter mf = new FileMenuFilter(
+ getFile(),
+ currentAccount,
+ containerActivity,
+ getActivity(),
+ false
+ );
+ mf.filter(menu,
+ true,
+ accountManager.isMediaStreamingSupported(currentAccount));
+ }
+
+ // additional restriction for this fragment
+ FileMenuFilter.hideMenuItems(
+ menu.findItem(R.id.action_rename_file),
+ menu.findItem(R.id.action_select_all),
+ menu.findItem(R.id.action_move),
+ menu.findItem(R.id.action_download_file),
+ menu.findItem(R.id.action_sync_file),
+ menu.findItem(R.id.action_sync_account),
+ menu.findItem(R.id.action_favorite),
+ menu.findItem(R.id.action_unset_favorite)
+ );
+
+ Boolean dualPane = getResources().getBoolean(R.bool.large_land_layout);
+
+ if (!dualPane) {
+ FileMenuFilter.hideMenuItems(menu.findItem(R.id.action_switch_view),
+ menu.findItem(R.id.action_sort)
+ );
+ }
+
+ if (getFile().isSharedWithMe() && !getFile().canReshare()) {
+ FileMenuFilter.hideMenuItem(menu.findItem(R.id.action_send_share_file));
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.action_send_share_file: {
+ if (getFile().isSharedWithMe() && !getFile().canReshare()) {
+ DisplayUtils.showSnackMessage(getView(), R.string.resharing_is_not_allowed);
+ } else {
+ containerActivity.getFileOperationsHelper().sendShareFile(getFile());
+ }
+ return true;
+ }
+ case R.id.action_open_file_with: {
+ openFile();
+ return true;
+ }
+ case R.id.action_remove_file: {
+ RemoveFilesDialogFragment dialog = RemoveFilesDialogFragment.newInstance(getFile());
+ dialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION);
+ return true;
+ }
+ case R.id.action_see_details: {
+ seeDetails();
+ return true;
+ }
+ case R.id.action_sync_file: {
+ containerActivity.getFileOperationsHelper().syncFile(getFile());
+ return true;
+ }
+
+ default:
+ return super.onOptionsItemSelected(item);
+ }
+ }
+
+ /**
+ * Update the file of the fragment with file value
+ *
+ * @param file The new file to set
+ */
+ public void updateFile(OCFile file) {
+ setFile(file);
+ }
+
+ private void seeDetails() {
+ containerActivity.showDetails(getFile());
+ }
+
+ /**
+ * Opens the previewed file with an external application.
+ */
+ private void openFile() {
+ containerActivity.getFileOperationsHelper().openFile(getFile());
+ finish();
+ }
+
+ /**
+ * Helper method to test if an {@link OCFile} can be passed to a {@link PreviewTextFileFragment} to be previewed.
+ *
+ * @param file File to test if can be previewed.
+ * @return 'True' if the file can be handled by the fragment.
+ */
+ public static boolean canBePreviewed(OCFile file) {
+ final List unsupportedTypes = new LinkedList<>();
+ unsupportedTypes.add("text/richtext");
+ unsupportedTypes.add("text/rtf");
+ unsupportedTypes.add("text/calendar");
+ unsupportedTypes.add("text/vnd.abc");
+ unsupportedTypes.add("text/vnd.fmi.flexstor");
+ unsupportedTypes.add("text/vnd.rn-realtext");
+ unsupportedTypes.add("text/vnd.wap.wml");
+ unsupportedTypes.add("text/vnd.wap.wmlscript");
+ return file != null && file.isDown() && MimeTypeUtil.isText(file) &&
+ !unsupportedTypes.contains(file.getMimeType()) &&
+ !unsupportedTypes.contains(MimeTypeUtil.getMimeTypeFromPath(file.getRemotePath()));
+ }
+
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ Log_OC.e(TAG, "onStop");
+
+ if (textLoadAsyncTask != null) {
+ textLoadAsyncTask.cancel(Boolean.TRUE);
+ }
+ }
+
+}
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
index 25f845c1e6ab..7937e296d9af 100644
--- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
@@ -19,21 +19,16 @@
package com.owncloud.android.ui.preview;
-import android.accounts.Account;
import android.content.Context;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
-import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.text.Html;
import android.text.Spanned;
import android.text.TextPaint;
import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -44,35 +39,16 @@
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.di.Injectable;
import com.owncloud.android.R;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.FileMenuFilter;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.activity.FileDisplayActivity;
-import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
-import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
import com.owncloud.android.ui.fragment.FileFragment;
-import com.owncloud.android.utils.DisplayUtils;
-import com.owncloud.android.utils.MimeTypeUtil;
import com.owncloud.android.utils.StringUtils;
import com.owncloud.android.utils.ThemeUtils;
-import org.mozilla.universalchardet.ReaderFactory;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.lang.ref.WeakReference;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Scanner;
-
import javax.inject.Inject;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.SearchView;
-import androidx.core.view.MenuItemCompat;
import io.noties.markwon.AbstractMarkwonPlugin;
import io.noties.markwon.Markwon;
import io.noties.markwon.core.MarkwonTheme;
@@ -94,46 +70,25 @@
},
grammarLocatorClassName = ".MarkwonGrammarLocator"
)
-public class PreviewTextFragment extends FileFragment implements SearchView.OnQueryTextListener, Injectable {
- private static final String EXTRA_FILE = "FILE";
- private static final String EXTRA_ACCOUNT = "ACCOUNT";
+public abstract class PreviewTextFragment extends FileFragment implements SearchView.OnQueryTextListener, Injectable {
private static final String TAG = PreviewTextFragment.class.getSimpleName();
- private Account mAccount;
- private TextView mTextPreview;
- private TextLoadAsyncTask mTextLoadTask;
- private String mOriginalText;
-
- private Handler mHandler;
- private SearchView mSearchView;
- private RelativeLayout mMultiView;
+ protected SearchView mSearchView;
+ protected String mSearchQuery = "";
+ protected boolean mSearchOpen;
+ protected TextView mTextPreview;
+ protected Handler mHandler;
+ protected RelativeLayout mMultiView;
+ protected String mOriginalText;
private TextView mMultiListMessage;
private TextView mMultiListHeadline;
private ImageView mMultiListIcon;
private ProgressBar mMultiListProgress;
-
- private String mSearchQuery = "";
- private boolean mSearchOpen;
-
@Inject UserAccountManager accountManager;
- /**
- * Creates an empty fragment for previews.
- *
- * MUST BE KEPT: the system uses it when tries to re-instantiate a fragment automatically
- * (for instance, when the device is turned a aside).
- *
- * DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful
- * construction
- */
- public PreviewTextFragment() {
- super();
- mAccount = null;
- }
-
/**
* {@inheritDoc}
*/
@@ -171,59 +126,6 @@ private void setMultiListLoadingMessage() {
}
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setHasOptionsMenu(true);
-
- OCFile file = getFile();
-
- Bundle args = getArguments();
-
- if (file == null) {
- file = args.getParcelable(FileDisplayActivity.EXTRA_FILE);
- }
-
- if (mAccount == null) {
- mAccount = args.getParcelable(FileDisplayActivity.EXTRA_ACCOUNT);
- }
-
- if (args.containsKey(FileDisplayActivity.EXTRA_SEARCH_QUERY)) {
- mSearchQuery = args.getString(FileDisplayActivity.EXTRA_SEARCH_QUERY);
- }
- mSearchOpen = args.getBoolean(FileDisplayActivity.EXTRA_SEARCH, false);
-
- if (savedInstanceState == null) {
- if (file == null) {
- throw new IllegalStateException("Instanced with a NULL OCFile");
- }
- if (mAccount == null) {
- throw new IllegalStateException("Instanced with a NULL ownCloud Account");
- }
- } else {
- file = savedInstanceState.getParcelable(EXTRA_FILE);
- mAccount = savedInstanceState.getParcelable(EXTRA_ACCOUNT);
- }
-
- mHandler = new Handler();
- setFile(file);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void onSaveInstanceState(@NonNull Bundle outState) {
- outState.putParcelable(PreviewTextFragment.EXTRA_FILE, getFile());
- outState.putParcelable(PreviewTextFragment.EXTRA_ACCOUNT, mAccount);
-
- super.onSaveInstanceState(outState);
- }
-
@Override
public void onStart() {
super.onStart();
@@ -232,11 +134,7 @@ public void onStart() {
loadAndShowTextPreview();
}
- private void loadAndShowTextPreview() {
- mTextLoadTask = new TextLoadAsyncTask(new WeakReference<>(mTextPreview));
- mTextLoadTask.execute(getFile().getStoragePath());
- }
-
+ abstract void loadAndShowTextPreview();
@Override
public boolean onQueryTextSubmit(String query) {
@@ -267,7 +165,7 @@ private void performSearch(final String query, int delay) {
mTextPreview.setText(Html.fromHtml(coloredText.replace("\n", "
")));
}
} else {
- setText(mTextPreview, mOriginalText, getFile());
+ setText(mTextPreview, mOriginalText, getContext());
}
}, delay);
}
@@ -277,7 +175,7 @@ private void performSearch(final String query, int delay) {
}
}
- private Spanned getRenderedMarkdownText(Context context, String markdown) {
+ protected static Spanned getRenderedMarkdownText(Context context, String markdown) {
Prism4j prism4j = new Prism4j(new MarkwonGrammarLocator());
Prism4jTheme prism4jTheme = Prism4jThemeDefault.create();
TaskListDrawable drawable = new TaskListDrawable(Color.GRAY, Color.GRAY, Color.WHITE);
@@ -302,263 +200,16 @@ public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
return markwon.toMarkdown(markdown);
}
- /**
- * Reads the file to preview and shows its contents. Too critical to be anonymous.
- */
- private class TextLoadAsyncTask extends AsyncTask {
- private static final int PARAMS_LENGTH = 1;
- private final WeakReference mTextViewReference;
-
- private TextLoadAsyncTask(WeakReference textView) {
- mTextViewReference = textView;
- }
-
- @Override
- protected void onPreExecute() {
- // not used at the moment
- }
-
- @Override
- protected StringWriter doInBackground(Object... params) {
- if (params.length != PARAMS_LENGTH) {
- throw new IllegalArgumentException("The parameter to " + TextLoadAsyncTask.class.getName()
- + " must be (1) the file location");
- }
- String location = (String) params[0];
-
- Scanner scanner = null;
- StringWriter source = new StringWriter();
- BufferedWriter bufferedWriter = new BufferedWriter(source);
- Reader reader = null;
-
- try {
- File file = new File(location);
- reader = ReaderFactory.createReaderFromFile(file);
- scanner = new Scanner(reader);
-
- while (scanner.hasNextLine()) {
- bufferedWriter.append(scanner.nextLine());
- if (scanner.hasNextLine()) {
- bufferedWriter.append("\n");
- }
- }
- bufferedWriter.close();
- IOException exc = scanner.ioException();
- if (exc != null) {
- throw exc;
- }
- } catch (IOException e) {
- Log_OC.e(TAG, e.getMessage(), e);
- finish();
- } finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e) {
- Log_OC.e(TAG, e.getMessage(), e);
- finish();
- }
- }
- if (scanner != null) {
- scanner.close();
- }
- }
- return source;
- }
-
- @Override
- protected void onPostExecute(final StringWriter stringWriter) {
- final TextView textView = mTextViewReference.get();
-
- if (textView != null) {
- mOriginalText = stringWriter.toString();
- mSearchView.setOnQueryTextListener(PreviewTextFragment.this);
-
- setText(textView, mOriginalText, getFile());
-
- if (mSearchOpen) {
- mSearchView.setQuery(mSearchQuery, true);
- }
- textView.setVisibility(View.VISIBLE);
- }
-
- if (mMultiView != null) {
- mMultiView.setVisibility(View.GONE);
- }
-
- }
-
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
- inflater.inflate(R.menu.item_file, menu);
-
- MenuItem menuItem = menu.findItem(R.id.action_search);
- menuItem.setVisible(true);
- mSearchView = (SearchView) MenuItemCompat.getActionView(menuItem);
- mSearchView.setMaxWidth(Integer.MAX_VALUE);
-
- if (mSearchOpen) {
- mSearchView.setIconified(false);
- mSearchView.setQuery(mSearchQuery, false);
- mSearchView.clearFocus();
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void onPrepareOptionsMenu(Menu menu) {
- super.onPrepareOptionsMenu(menu);
-
- if (containerActivity.getStorageManager() != null) {
- Account currentAccount = containerActivity.getStorageManager().getAccount();
- FileMenuFilter mf = new FileMenuFilter(
- getFile(),
- currentAccount,
- containerActivity,
- getActivity(),
- false
- );
- mf.filter(menu,
- true,
- accountManager.isMediaStreamingSupported(currentAccount));
- }
-
- // additional restriction for this fragment
- FileMenuFilter.hideMenuItems(
- menu.findItem(R.id.action_rename_file),
- menu.findItem(R.id.action_select_all),
- menu.findItem(R.id.action_move),
- menu.findItem(R.id.action_download_file),
- menu.findItem(R.id.action_sync_file),
- menu.findItem(R.id.action_sync_account),
- menu.findItem(R.id.action_favorite),
- menu.findItem(R.id.action_unset_favorite)
- );
-
- Boolean dualPane = getResources().getBoolean(R.bool.large_land_layout);
-
- if (!dualPane) {
- FileMenuFilter.hideMenuItems(menu.findItem(R.id.action_switch_view),
- menu.findItem(R.id.action_sort)
- );
- }
-
- if(getFile().isSharedWithMe() && !getFile().canReshare()){
- FileMenuFilter.hideMenuItem(menu.findItem(R.id.action_send_share_file));
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.action_send_share_file: {
- if(getFile().isSharedWithMe() && !getFile().canReshare()){
- DisplayUtils.showSnackMessage(getView(), R.string.resharing_is_not_allowed);
- } else {
- containerActivity.getFileOperationsHelper().sendShareFile(getFile());
- }
- return true;
- }
- case R.id.action_open_file_with: {
- openFile();
- return true;
- }
- case R.id.action_remove_file: {
- RemoveFilesDialogFragment dialog = RemoveFilesDialogFragment.newInstance(getFile());
- dialog.show(getFragmentManager(), ConfirmationDialogFragment.FTAG_CONFIRMATION);
- return true;
- }
- case R.id.action_see_details: {
- seeDetails();
- return true;
- }
- case R.id.action_sync_file: {
- containerActivity.getFileOperationsHelper().syncFile(getFile());
- return true;
- }
-
- default:
- return super.onOptionsItemSelected(item);
- }
- }
-
- /**
- * Update the file of the fragment with file value
- *
- * @param file The new file to set
- */
- public void updateFile(OCFile file) {
- setFile(file);
- }
-
- private void seeDetails() {
- containerActivity.showDetails(getFile());
- }
-
- @Override
- public void onStop() {
- super.onStop();
- Log_OC.e(TAG, "onStop");
- if (mTextLoadTask != null) {
- mTextLoadTask.cancel(Boolean.TRUE);
- }
- }
-
- /**
- * Opens the previewed file with an external application.
- */
- private void openFile() {
- containerActivity.getFileOperationsHelper().openFile(getFile());
- finish();
- }
-
- /**
- * Helper method to test if an {@link OCFile} can be passed to a {@link PreviewTextFragment} to be previewed.
- *
- * @param file File to test if can be previewed.
- * @return 'True' if the file can be handled by the fragment.
- */
- public static boolean canBePreviewed(OCFile file) {
- final List unsupportedTypes = new LinkedList<>();
- unsupportedTypes.add("text/richtext");
- unsupportedTypes.add("text/rtf");
- unsupportedTypes.add("text/calendar");
- unsupportedTypes.add("text/vnd.abc");
- unsupportedTypes.add("text/vnd.fmi.flexstor");
- unsupportedTypes.add("text/vnd.rn-realtext");
- unsupportedTypes.add("text/vnd.wap.wml");
- unsupportedTypes.add("text/vnd.wap.wmlscript");
- return file != null && file.isDown() && MimeTypeUtil.isText(file) &&
- !unsupportedTypes.contains(file.getMimeType()) &&
- !unsupportedTypes.contains(MimeTypeUtil.getMimeTypeFromPath(file.getRemotePath()));
- }
-
/**
* Finishes the preview
*/
- private void finish() {
- getActivity().runOnUiThread(new Runnable() {
- @Override
- public void run() {
- getActivity().onBackPressed();
- }
- });
+ protected void finish() {
+ getActivity().runOnUiThread(() -> getActivity().onBackPressed());
}
- private void setText(TextView textView, String text, OCFile file) {
- if (MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType())) {
- textView.setText(getRenderedMarkdownText(getContext(), text));
+ public static void setText(TextView textView, String text, Context context) {
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN && context != null) {
+ textView.setText(getRenderedMarkdownText(context, text));
} else {
textView.setText(text);
}
diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java
new file mode 100644
index 000000000000..4a4912f95413
--- /dev/null
+++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java
@@ -0,0 +1,174 @@
+/*
+ *
+ * Nextcloud Android client application
+ *
+ * @author Tobias Kaminsky
+ * Copyright (C) 2019 Tobias Kaminsky
+ * Copyright (C) 2019 Nextcloud GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+
+package com.owncloud.android.ui.preview;
+
+import android.accounts.Account;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.nextcloud.android.lib.richWorkspace.RichWorkspaceDirectEditingRemoteOperation;
+import com.nextcloud.client.account.UserAccountManager;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.lib.common.operations.RemoteOperationResult;
+import com.owncloud.android.ui.activity.FileDisplayActivity;
+import com.owncloud.android.utils.DisplayUtils;
+import com.owncloud.android.utils.ThemeUtils;
+
+import org.jetbrains.annotations.NotNull;
+
+import javax.inject.Inject;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+
+public class PreviewTextStringFragment extends PreviewTextFragment {
+ private static final String EXTRA_FILE = "FILE";
+
+ @Inject UserAccountManager accountManager;
+
+ /**
+ * Creates an empty fragment for previews.
+ *
+ * MUST BE KEPT: the system uses it when tries to re-instantiate a fragment automatically (for instance, when the
+ * device is turned a aside).
+ *
+ * DO NOT CALL IT: an {@link OCFile} and {@link Account} must be provided for a successful construction
+ */
+ public PreviewTextStringFragment() {
+ super();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setHasOptionsMenu(true);
+
+ Bundle args = getArguments();
+
+ if (args.containsKey(FileDisplayActivity.EXTRA_SEARCH_QUERY)) {
+ mSearchQuery = args.getString(FileDisplayActivity.EXTRA_SEARCH_QUERY);
+ }
+ mSearchOpen = args.getBoolean(FileDisplayActivity.EXTRA_SEARCH, false);
+
+ mHandler = new Handler();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onSaveInstanceState(@NonNull Bundle outState) {
+ outState.putParcelable(PreviewTextStringFragment.EXTRA_FILE, getFile());
+
+ super.onSaveInstanceState(outState);
+ }
+
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ View view = super.onCreateView(inflater, container, savedInstanceState);
+
+ if (view == null) {
+ throw new RuntimeException("View may not be null");
+ }
+
+ FloatingActionButton mFabMain = view.findViewById(R.id.text_preview_fab);
+ mFabMain.setVisibility(View.VISIBLE);
+ mFabMain.setEnabled(true);
+ mFabMain.setOnClickListener(v -> edit());
+ ThemeUtils.tintFloatingActionButton(mFabMain, R.drawable.ic_edit, getContext());
+
+ return view;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onCreateOptionsMenu(@NotNull Menu menu, @NotNull MenuInflater inflater) {
+ super.onCreateOptionsMenu(menu, inflater);
+
+ MenuItem menuItem = menu.findItem(R.id.action_search);
+ menuItem.setVisible(true);
+ mSearchView = (SearchView) MenuItemCompat.getActionView(menuItem);
+ mSearchView.setOnQueryTextListener(this);
+ mSearchView.setMaxWidth(Integer.MAX_VALUE);
+
+ if (mSearchOpen) {
+ mSearchView.setIconified(false);
+ mSearchView.setQuery(mSearchQuery, true);
+ mSearchView.clearFocus();
+ }
+ }
+
+ @Override
+ public void onPrepareOptionsMenu(@NonNull Menu menu) {
+ super.onPrepareOptionsMenu(menu);
+
+ menu.findItem(R.id.action_sync_account).setVisible(false);
+ menu.findItem(R.id.action_sort).setVisible(false);
+ menu.findItem(R.id.action_switch_view).setVisible(false);
+ }
+
+ void loadAndShowTextPreview() {
+ if (mTextPreview != null) {
+ mOriginalText = getFile().getRichWorkspace();
+ setText(mTextPreview, mOriginalText, getContext());
+ mTextPreview.setVisibility(View.VISIBLE);
+ }
+
+ if (mMultiView != null) {
+ mMultiView.setVisibility(View.GONE);
+ }
+ }
+
+ private void edit() {
+ new Thread(() -> {
+ RemoteOperationResult result = new RichWorkspaceDirectEditingRemoteOperation(getFile().getRemotePath())
+ .execute(accountManager.getUser().toPlatformAccount(), getContext());
+
+ if (result.isSuccess()) {
+ String url = (String) result.getSingleData();
+ containerActivity.getFileOperationsHelper().openRichWorkspaceWithTextEditor(getFile(),
+ url,
+ getContext());
+ } else {
+ DisplayUtils.showSnackMessage(getView(), "Error");
+ }
+ }).start();
+ }
+
+ // TODO on close clean search query
+}
diff --git a/src/main/java/com/owncloud/android/utils/FileStorageUtils.java b/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
index 578bf500cf72..f9d724485896 100644
--- a/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/main/java/com/owncloud/android/utils/FileStorageUtils.java
@@ -223,6 +223,7 @@ public static OCFile fillOCFile(RemoteFile remote) {
file.setOwnerDisplayName(remote.getOwnerDisplayName());
file.setNote(remote.getNote());
file.setSharees(new ArrayList<>(Arrays.asList(remote.getSharees())));
+ file.setRichWorkspace(remote.getRichWorkspace());
return file;
}
diff --git a/src/main/res/drawable/ic_edit.xml b/src/main/res/drawable/ic_edit.xml
new file mode 100644
index 000000000000..9ff05de2c05d
--- /dev/null
+++ b/src/main/res/drawable/ic_edit.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
diff --git a/src/main/res/layout/list_header.xml b/src/main/res/layout/list_header.xml
new file mode 100644
index 000000000000..bf0453338317
--- /dev/null
+++ b/src/main/res/layout/list_header.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
diff --git a/src/main/res/layout/richdocuments_webview.xml b/src/main/res/layout/richdocuments_webview.xml
index ee4b356dde7e..4bb72dc610d4 100644
--- a/src/main/res/layout/richdocuments_webview.xml
+++ b/src/main/res/layout/richdocuments_webview.xml
@@ -64,8 +64,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
-
-
-
+ android:layout_height="wrap_content">
-
-
\ No newline at end of file
+
+
+
diff --git a/src/main/res/menu/item_file.xml b/src/main/res/menu/item_file.xml
index 02293b816e79..26a5e3ee7675 100644
--- a/src/main/res/menu/item_file.xml
+++ b/src/main/res/menu/item_file.xml
@@ -22,6 +22,12 @@
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AppCompatResource">
+ - nextcloud
Nextcloud
Mozilla/5.0 (Android) Nextcloud-android/%1$s
+ Mozilla/5.0 (Android %1$s) Mobile Nextcloud-android/%2$s
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c52d623394a9..ce9b735178a2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -810,7 +810,6 @@
Internal streaming not possible
Please download media instead or use external app.
Folder already exists
- Open with %1$s
Notification icon
Create
Delete
@@ -908,4 +907,5 @@
folder
file
Share internal link
+ Edit