This repository has been archived by the owner on Apr 12, 2022. It is now read-only.
make Widget/Integration mgr optional (#3224) #3235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BillCarsonFr
force-pushed
the
feature/integration_mgr_3224
branch
from
d61eaa2 to
952a256
Compare
manuroe
reviewed
Jul 30, 2019
| @@ -809,6 +809,7 @@ | |||
| <string name="settings_logged_in">Logged in as</string> | |||
| <string name="settings_home_server">Home Server</string> | |||
| <string name="settings_identity_server">Identity Server</string> | |||
| <string name="settings_integration_server">Integration Server</string> | |||
| @@ -14,8 +14,7 @@ | |||
| <string name="bug_report_url" translatable="false">https://riot.im/bugreports/submit</string> | |||
|
|
|||
| <!-- Widget urls --> | |||
| <string name="integrations_ui_url" translatable="false">"https://scalar.vector.im/"</string> | |||
| <string name="integrations_rest_url" translatable="false">"https://scalar.vector.im/api"</string> | |||
| <string name="integration_server_url" translatable="false">"https://scalar.vector.im"</string> | |||
There was a problem hiding this comment.
I would prefer that we keep 2 app settings for the moment. One for the UI. One for the API.
There was a problem hiding this comment.
Ok, changed to use 3 settings (added integrations_jitsi_widget_url)
|
|
||
| val config = IntegrationManagerConfig( | ||
| uiUrl = "$serverURL/", | ||
| apiUrl = "$serverURL/api", |
There was a problem hiding this comment.
That seems a bit dangerous atm. /api suffix is not guaranteed.
This is something that will change but not before phase:2
manuroe
approved these changes
Jul 31, 2019
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3224
Make widget/integration manager optional.
Integration manager is read from preferences with default values to new vector integration server.
Integration (Matrix app / stickers) ui elements are removed when no integration manager is defined