only show "Add to your Nextcloud" on share link if federation is acti…

[violoncelloCH]

…vated

This only hides "Add to your Nextcloud" if the checkmark for federated sharing in settings is unchecked. Deactivating the federation app does not hide these settings and does not hide the "Add to your Nextcloud"-option as well.

fixes #12395

[violoncelloCH]

@juliushaertl like this? ^

[violoncelloCH]

@juliushaertl @ChristophWurst @skjnldsv can we have another review here?

[skjnldsv]

Much cleaner :)

[violoncelloCH]

may I add myself as author to the file header now? or what do you consider a "substantial change"?

[skjnldsv]

may I add myself as author to the file header now? or what do you consider a "substantial change"?

You can always add yourself to the header. I'd even say you always should. But most of the time people forget :/

[violoncelloCH]

You can always add yourself to the header. I'd even say you always should. But most of the time people forget :/

good to know! I've done it now...

[kesselb]

$responseComposer = [];

if ($shareIsFolder) {
	$responseComposer[] = new SimpleMenuAction('download', $this->l10n->t('Download all files'), 'icon-download-white', $shareTmpl['downloadURL'], 0);
	$responseComposer[] = new SimpleMenuAction('download', $this->l10n->t('Download all files'), 'icon-download', $shareTmpl['downloadURL'], 10, $shareTmpl['fileSize']);
} else {
	$responseComposer[] = new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download-white', $shareTmpl['downloadURL'], 0);
	$responseComposer[] = new SimpleMenuAction('download', $this->l10n->t('Download'), 'icon-download', $shareTmpl['downloadURL'], 10, $shareTmpl['fileSize']);
}

$responseComposer[] = new LinkMenuAction($this->l10n->t('Direct link'), 'icon-public', $shareTmpl['previewURL']);
if ($this->federatedShareProvider->isOutgoingServer2serverShareEnabled()) {
	$responseComposer[] = new ExternalShareMenuAction($this->l10n->t('Add to your Nextcloud'), 'icon-external', $shareTmpl['owner'], $shareTmpl['displayName'], $shareTmpl['filename']);
}

I think it looks cleaner if you do it like above. Yes the download buttons looks similar but they are different. If you dont agree just ignore 🤣

[kesselb]

Well done 👍

outdated / requested changes implemented

[violoncelloCH]

@danielkesselberg thank you! I get your point; the variables are only assigned and use once, so not really necessary -- however I think it's easier to read the code with the variables... But if you want the code to be more compact I can change it :)

[kesselb]

@danielkesselberg thank you! I get your point; the variables are only assigned and use once, so not really necessary -- however I think it's easier to read the code with the variables... But if you want the code to be more compact I can change it :)

Up to you ;-) If someone approves a pull request and suggests changes they are not mandatory (i think they are not mandatory but could be wrong 🤣)

[violoncelloCH]

what's wrong with drone here?

[skjnldsv]

🎉

[skjnldsv]

@violoncelloCH can you rebase? Drone will recreate itself :)

[violoncelloCH]

rebase done...

[violoncelloCH]

looks like there is always one randomly failing drone test... :/

[MorrisJobke]

They are unrelated - it was a codecov failure.