Skip to content

- fix not clickable rich workspace area #5114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 1 commit into from
Jan 8, 2020
Merged

- fix not clickable rich workspace area #5114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/analysis/findbugs-results.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
413
414
2 changes: 1 addition & 1 deletion src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 13 additions & 4 deletions src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/owncloud/android/ui/preview/PreviewTextStringFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down