diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index 36352541cc85..d1b9f6a9c4b4 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -413 +414 diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java index 33d0b539fe40..1486849306db 100644 --- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java +++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java @@ -329,7 +329,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi OCFileListHeaderViewHolder headerViewHolder = (OCFileListHeaderViewHolder) holder; String text = currentDirectory.getRichWorkspace(); - PreviewTextFragment.setText(headerViewHolder.headerText, text, getItem(position), activity); + PreviewTextFragment.setText(headerViewHolder.headerText, text, null, activity, true, true); headerViewHolder.headerView.setOnClickListener(v -> ocFileListFragmentInterface.onHeaderClicked()); } else { OCFileListGridImageViewHolder gridViewHolder = (OCFileListGridImageViewHolder) holder; 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 688ef797f183..dd6de898fbe8 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java @@ -55,6 +55,7 @@ import javax.inject.Inject; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.appcompat.widget.SearchView; import io.noties.markwon.AbstractMarkwonPlugin; import io.noties.markwon.Markwon; @@ -226,14 +227,22 @@ protected void finish() { } public static void setText(TextView textView, String text, OCFile file, Activity activity) { - setText(textView, text, file, activity, false); + setText(textView, text, file, activity, false, false); } - public static void setText(TextView textView, String text, OCFile file, Activity activity, boolean ignoreMimetype) { - if ((MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType()) || ignoreMimetype) && + public static void setText(TextView textView, + String text, + @Nullable OCFile file, + Activity activity, + boolean ignoreMimetype, + boolean preview) { + if ((ignoreMimetype || file != null && MimeTypeUtil.MIMETYPE_TEXT_MARKDOWN.equals(file.getMimeType())) && android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN && activity != null) { - textView.setMovementMethod(LinkMovementMethod.getInstance()); + if (!preview) { + // clickable links prevent to open full view of rich workspace + textView.setMovementMethod(LinkMovementMethod.getInstance()); + } textView.setText(getRenderedMarkdownText(activity, 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 index 044924b9d70c..9214a2a6c3e6 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java @@ -145,7 +145,7 @@ public void onPrepareOptionsMenu(@NonNull Menu menu) { void loadAndShowTextPreview() { if (mTextPreview != null) { mOriginalText = getFile().getRichWorkspace(); - setText(mTextPreview, mOriginalText, getFile(), requireActivity(), true); + setText(mTextPreview, mOriginalText, getFile(), requireActivity(), true, false); mTextPreview.setVisibility(View.VISIBLE); }