Make hyperlinks clickable in markdown previews #5035

AndyScherzinger · 2019-12-19T13:56:41Z

Resolves: #5030

tobiasKaminsky · 2019-12-19T14:04:25Z

src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java

+                            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(link));
+                            DisplayUtils.startIntentIfAppAvailable(intent, getActivity(), R.string.no_browser_available);
+                        } catch (Throwable throwable) {
+                            Toast.makeText(context, R.string.error_opening_link, Toast.LENGTH_SHORT).show();


I prefer snackbar instead of toast?

fine with me, yes. I'll change that

Toast is deprecated in Material Design in favour of Snackbar.

AndyScherzinger · 2019-12-19T21:36:35Z

@tobiasKaminsky can you please rebase and fix this thing? Your PR #4890 breaks the whole concept here. We only display markdown rendering if it has the right mimetype, which you just killed via your rich-thing PR 😠

tobiasKaminsky · 2019-12-20T06:08:40Z

Your PR #4890 breaks the whole concept here.

Idea is to have the same as in office documents or audio/video:
if the file is downloaded, show it locally.
If it is not downloaded, show it online.

I will take care of this.

Other than that your PR is working fine 👍

AndyScherzinger · 2019-12-20T07:23:58Z

if the file is downloaded, show it locally.
If it is not downloaded, show it online.

That's not the point. Point is your removed/hide the OCFile (I know I can call getFile()) so markdown rendering is always triggered! Markdown should not be triggered for non markdown mimetypes!

Other than that your PR is working fine

Don't know, since we now have TextPreview and TextFilePreview while I haven't checked if both would still do proper markdown rendering and would also just do this in case of markdown present.

tobiasKaminsky · 2019-12-20T11:13:20Z

TextPreview and TextFilePreview

TextPreview is an abstract class, which is used by PreviewTextFile and PreviewTextString

I'll take care of it next year.
Just as an hint for me: What happens if I show plain text with Markdown? (we do the same on web with text app).

Resolves: #5030 Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

codecov · 2020-01-06T09:25:07Z

Codecov Report

Merging #5035 into master will increase coverage by <.01%.
The diff coverage is 25%.

@@             Coverage Diff              @@
##             master    #5035      +/-   ##
============================================
+ Coverage      17.7%   17.71%   +<.01%     
  Complexity        3        3              
============================================
  Files           389      389              
  Lines         32893    32901       +8     
  Branches       4627     4627              
============================================
+ Hits           5825     5828       +3     
- Misses        26115    26117       +2     
- Partials        953      956       +3

Impacted Files	Coverage Δ	Complexity Δ
...java/com/nextcloud/client/di/ComponentsModule.java	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
...ncloud/android/ui/preview/PreviewTextFragment.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
.../android/ui/preview/PreviewTextStringFragment.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...cloud/android/ui/activity/FileDisplayActivity.java	`20.3% <0%> (+0.31%)`	`0 <0> (ø)`	⬇️
...ud/android/ui/preview/PreviewTextFileFragment.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...owncloud/android/ui/adapter/OCFileListAdapter.java	`28.51% <37.83%> (-0.37%)`	`0 <0> (ø)`
...om/owncloud/android/utils/FileSortOrderByName.java	`14.28% <0%> (-2.86%)`	`0% <0%> (ø)`
...in/java/com/owncloud/android/utils/ThemeUtils.java	`49.41% <0%> (-1.56%)`	`0% <0%> (ø)`
...oud/android/ui/activity/SyncedFoldersActivity.java	`25.06% <0%> (-1.26%)`	`0% <0%> (ø)`
.../java/com/owncloud/android/utils/DisplayUtils.java	`24.89% <0%> (-0.85%)`	`0% <0%> (ø)`
... and 10 more

AndyScherzinger · 2020-01-06T09:26:49Z

src/main/java/com/nextcloud/client/di/ComponentsModule.java

    @ContributesAndroidInjector abstract PreviewTextFragment previewTextFragment();
+
+    @ContributesAndroidInjector
+    abstract PreviewTextFileFragment previewTextFileFragment();


Should be one line

This is due to code formatting of Android Studio.
Not sure, if we want to do this then all the time manually, or stick 100% with code formatting and having line wraps…

I'd then say stick with AS code formatting, doing it manually leads to manual work.

AndyScherzinger

Looks good to me

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

nextcloud-android-bot · 2020-01-06T11:22:45Z

Here is an overview of what got changed by this pull request:

Issues
======
- Added 1

See the complete overview on Codacy

src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java

nextcloud-android-bot · 2020-01-06T11:38:28Z

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/12130.apk

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

nextcloud-android-bot · 2020-01-06T11:45:18Z

Codacy

548

Lint

Type	master	PR
Warnings	74	74
Errors	0	0

SpotBugs (new)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	71
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	106
Security Warnings	44
Dodgy code Warnings	139
Total	413

SpotBugs (master)

Warning Type	Number
Bad practice Warnings	26
Correctness Warnings	71
Internationalization Warnings	13
Malicious code vulnerability Warnings	5
Multithreaded correctness Warnings	9
Performance Warnings	106
Security Warnings	44
Dodgy code Warnings	139
Total	413

f690417 Merge pull request #5102 from nextcloud/removeNC12 051423c remove support for NC12 d7d1c47 Merge pull request #5031 from nextcloud/ezaquarii/fix-npe-crash-when-storage-manager-is-not-set 9b79b85 Merge pull request #5065 from nextcloud/ezaquarii/fix-crash-when-making-new-ods-file 32ebe69 Merge pull request #5066 from nextcloud/ezaquarii/fix-shared-by-null-glitch 6e07d18 Merge pull request #5035 from nextcloud/enh/clickableMarkdownLinks 5fce6ca Removed unneeded try/catch a680697 Removed unneeded try/catch 154b9af adjusted to master a15f724 Make hyperlinks clickable in markdown previews 5f70ea6 Make hyperlinks clickable in markdown previews cd0f834 [tx-robot] updated from transifex 22ab16e [tx-robot] updated from transifex 80d7d26 [tx-robot] updated from transifex 6d76582 [tx-robot] updated from transifex 167b250 Merge pull request #5085 from nextcloud/dependabot/gradle/junit-junit-4.13 7b6e1b7 [tx-robot] updated from transifex 1c12ca0 Bump junit from 4.12 to 4.13 71f919f [tx-robot] updated from transifex fc00d7d Merge pull request #5077 from nextcloud/dependabot/gradle/daggerVersion-2.25.4 9a3bf3a Bump daggerVersion from 2.25.3 to 2.25.4 0c3b8fc [tx-robot] updated from transifex ef84976 Fix "Shared by null" glitch in file details view 3cf3e3b Fix crash when adding new ODS file 2047079 Merge pull request #5060 from nextcloud/dependabot/gradle/io.gitlab.arturbosch.detekt-detekt-gradle-plugin-1.3.0 2882236 Bump detekt-gradle-plugin from 1.2.2 to 1.3.0 3687301 [tx-robot] updated from transifex f53d637 [tx-robot] updated from transifex 24921f6 [tx-robot] updated from transifex c30c6c7 daily dev 20191221

AndyScherzinger added the 3. to review label Dec 19, 2019

AndyScherzinger requested a review from tobiasKaminsky December 19, 2019 13:56

AndyScherzinger force-pushed the enh/clickableMarkdownLinks branch from bb2adfa to 163c258 Compare December 19, 2019 14:03

tobiasKaminsky reviewed Dec 19, 2019

View reviewed changes

nextcloud deleted a comment from tobiasKaminsky Dec 19, 2019

AndyScherzinger assigned tobiasKaminsky Dec 19, 2019

AndyScherzinger and others added 3 commits January 6, 2020 09:33

Make hyperlinks clickable in markdown previews

5f70ea6

Resolves: #5030 Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Make hyperlinks clickable in markdown previews

a15f724

Resolves: #5030 Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

adjusted to master

154b9af

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

tobiasKaminsky force-pushed the enh/clickableMarkdownLinks branch from 163c258 to 154b9af Compare January 6, 2020 09:10

nextcloud deleted a comment from tobiasKaminsky Jan 6, 2020

nextcloud deleted a comment from ezaquarii Jan 6, 2020

nextcloud deleted a comment from AndyScherzinger Jan 6, 2020

AndyScherzinger commented Jan 6, 2020

View reviewed changes

Removed unneeded try/catch

a680697

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

nextcloud deleted a comment from AndyScherzinger Jan 6, 2020

nextcloud deleted a comment from tobiasKaminsky Jan 6, 2020

Removed unneeded try/catch

5fce6ca

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

tobiasKaminsky force-pushed the enh/clickableMarkdownLinks branch from 994f432 to 5fce6ca Compare January 6, 2020 11:19

nextcloud-android-bot reviewed Jan 6, 2020

View reviewed changes

src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java Show resolved Hide resolved

tobiasKaminsky merged commit 6e07d18 into master Jan 6, 2020

delete-merged-branch bot deleted the enh/clickableMarkdownLinks branch January 6, 2020 12:03

AndyScherzinger added this to the Nextcloud App 3.10.0 milestone Jan 6, 2020

Uh oh!

Make hyperlinks clickable in markdown previews #5035

Make hyperlinks clickable in markdown previews #5035

Uh oh!

Conversation

AndyScherzinger commented Dec 19, 2019

Uh oh!

tobiasKaminsky Dec 19, 2019

Choose a reason for hiding this comment

Uh oh!

AndyScherzinger Dec 19, 2019

Choose a reason for hiding this comment

Uh oh!

ezaquarii Dec 20, 2019

Choose a reason for hiding this comment

Uh oh!

AndyScherzinger Dec 20, 2019

Choose a reason for hiding this comment

Uh oh!

AndyScherzinger commented Dec 19, 2019

Uh oh!

tobiasKaminsky commented Dec 20, 2019

Uh oh!

AndyScherzinger commented Dec 20, 2019

Uh oh!

tobiasKaminsky commented Dec 20, 2019

Uh oh!

codecov bot commented Jan 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

AndyScherzinger Jan 6, 2020

Choose a reason for hiding this comment

Uh oh!

tobiasKaminsky Jan 6, 2020

Choose a reason for hiding this comment

Uh oh!

AndyScherzinger Jan 6, 2020

Choose a reason for hiding this comment

Uh oh!

AndyScherzinger left a comment

Choose a reason for hiding this comment

Uh oh!

nextcloud-android-bot commented Jan 6, 2020

Uh oh!

Uh oh!

nextcloud-android-bot commented Jan 6, 2020

Uh oh!

nextcloud-android-bot commented Jan 6, 2020

Codacy

Lint

SpotBugs (new)

SpotBugs (master)

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Jan 6, 2020 •

edited

Loading