Skip to content
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.

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

add redirect info to external link #2864

Merged
merged 2 commits into from
Aug 28, 2018
Merged

Conversation

tobiasKaminsky
Copy link
Member

@tobiasKaminsky tobiasKaminsky commented Aug 6, 2018

Latest external app allows to choose if external site can be embedded or not, so this reflects the setting:

  • enabled: show internal
  • disabled: open up in browser, ask if no default/multiple apps can handle it

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

@codecov
Copy link

codecov bot commented Aug 6, 2018

Codecov Report

Merging #2864 into master will increase coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff            @@
##           master   #2864      +/-   ##
=========================================
+ Coverage    6.44%   6.44%   +<.01%     
=========================================
  Files         296     296              
  Lines       29653   29668      +15     
  Branches     4286    4290       +4     
=========================================
+ Hits         1911    1913       +2     
- Misses      27457   27470      +13     
  Partials      285     285
Impacted Files Coverage Δ
...ain/java/com/owncloud/android/db/ProviderMeta.java 88% <ø> (ø) ⬆️
...wncloud/android/providers/FileContentProvider.java 16.86% <0%> (-0.23%) ⬇️
...cloud/android/datamodel/ExternalLinksProvider.java 0% <0%> (ø) ⬆️
...m/owncloud/android/ui/activity/DrawerActivity.java 0% <0%> (ø) ⬆️
.../third_parties/daveKoeller/AlphanumComparator.java 82.75% <0%> (+1.14%) ⬆️
...cloud/android/datamodel/ArbitraryDataProvider.java 12.65% <0%> (+1.26%) ⬆️

@AndyScherzinger
Copy link
Member

AndyScherzinger commented Aug 7, 2018

👍 looks good to me code-wise while I am not sure "redirect" is the right word since I always think it is a http-redirect which it is not, but I am okay with keeping the name, no better term in mind...

Approved with PullApprove

@nextcloud nextcloud deleted a comment Aug 7, 2018
@nextcloud nextcloud deleted a comment Aug 7, 2018
@nextcloud nextcloud deleted a comment from AndyScherzinger Aug 7, 2018
@nextcloud nextcloud deleted a comment Aug 7, 2018
@nextcloud nextcloud deleted a comment from tobiasKaminsky Aug 7, 2018
@nextcloud nextcloud deleted a comment from AndyScherzinger Aug 7, 2018
@tobiasKaminsky
Copy link
Member Author

@AndyScherzinger I just took the name from upstream/app, while I agree that this is not the perfect name (on web UI it makes a bit more sense, as either the url is shown inline, or the user is redirected to the desired page).

@AndyScherzinger AndyScherzinger mentioned this pull request Aug 8, 2018
58 tasks
@AndyScherzinger AndyScherzinger force-pushed the externalLinkEmbedded branch 2 times, most recently from e063029 to c2e70ea Compare August 28, 2018 07:46
@nextcloud nextcloud deleted a comment Aug 28, 2018
tobiasKaminsky and others added 2 commits August 28, 2018 18:04
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
@AndyScherzinger
Copy link
Member

👍 just tested with the latest rebase, works fine

@nextcloud-android-bot
Copy link
Collaborator

Lint

TypeMasterPR
Warnings9393
Errors

FindBugs (new)

Warning TypeNumber
Bad practice Warnings35
Correctness Warnings165
Experimental Warnings4
Internationalization Warnings12
Malicious code vulnerability Warnings9
Multithreaded correctness Warnings9
Performance Warnings160
Security Warnings163
Dodgy code Warnings135
Total692

@AndyScherzinger AndyScherzinger merged commit 340eac5 into master Aug 28, 2018
@AndyScherzinger AndyScherzinger deleted the externalLinkEmbedded branch August 28, 2018 16:25
@AndyScherzinger
Copy link
Member

merging with a single approval since Mario is not available for reviews atm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants