Skip to content

Create the initialState in a single location#3403

Merged
nickvergessen merged 2 commits into
masterfrom
bugfix/noid/create-initial-state-in-a-single-location
Apr 27, 2020
Merged

Create the initialState in a single location#3403
nickvergessen merged 2 commits into
masterfrom
bugfix/noid/create-initial-state-in-a-single-location

Conversation

@nickvergessen

@nickvergessen nickvergessen commented Apr 27, 2020

Copy link
Copy Markdown
Member

Fixes #3244

Extracted from #3292

@danxuliu danxuliu left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

I have added a fixup to remove a redundant try/catch and another one to fix passing null to provideInitialState, as it is not supported.

Additionally I have fixed the attachment folder not taken into account in the Talk sidebar in the Files app, as the value returned from the initial state was not being used.

This should fix the attachment folder too when uploading a file as a user in the Talk sidebar of a public share or the video verification. However, the public share sets the user in incognito mode, so when the TemplateLoader is executed no user is returned so publishInitialStateForUser can not be called. @nickvergessen If you know how to fix that easily for this pull request, cool, but if not I am OK with fixing it at a later point.

nickvergessen and others added 2 commits April 27, 2020 22:49
Signed-off-by: Joas Schilling <coding@schilljs.com>
The attachment folder was set when the left sidebar was loaded. That
component is loaded only in the main Talk UI, so the attachment folder
provided in the initial state was ignored in the Talk sidebars. Now the
initial state for the attachment folder is used by default in the store,
so it applies everywhere.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@nickvergessen
nickvergessen force-pushed the bugfix/noid/create-initial-state-in-a-single-location branch from 9652aed to f3f104a Compare April 27, 2020 20:49
@nickvergessen
nickvergessen merged commit 01806a9 into master Apr 27, 2020
@nickvergessen
nickvergessen deleted the bugfix/noid/create-initial-state-in-a-single-location branch April 27, 2020 21:02
@nickvergessen

Copy link
Copy Markdown
Member Author

/backport to stable18

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable18 failed. Please do this backport manually.

@nickvergessen

Copy link
Copy Markdown
Member Author

Backport in #3421

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

H.264 preference not set on embeded pages

2 participants