This repository has been archived by the owner on Apr 12, 2022. It is now read-only.
Jitsi Widget Permissions #3393
Merged
Jitsi Widget Permissions #3393
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
bmarty
suggested changes
Nov 21, 2019
| } | ||
| return Unit.INSTANCE; | ||
| }); | ||
| bs.show(getSupportFragmentManager(), "JitsyPerm"); |
| @@ -65,7 +65,11 @@ class WidgetActivity : VectorAppCompatActivity() { | |||
| //already there | |||
| } else { | |||
| RoomWidgetPermissionBottomSheet | |||
| .newInstance(viewModel.session!!.myUserId, viewModel.widget) | |||
| .newInstance(viewModel.session!!.myUserId, viewModel.widget).apply { | |||
There was a problem hiding this comment.
Does this code is robust to screen rotation, will the bottomSheet is displayed?
There was a problem hiding this comment.
worst case you have to tap again on the video conf banner
|
|
||
| private val sharedActivityViewModel: RoomWidgetViewModel by activityViewModel() | ||
| var onFinish: ((Boolean) -> Unit)? = null |
There was a problem hiding this comment.
The sharedViewModel was better, no?
There was a problem hiding this comment.
It makes the bottom sheet more generic, can be used in other activity easier
bmarty
approved these changes
Nov 22, 2019
| @@ -1772,7 +1772,7 @@ private void launchJitsiActivity(Widget widget, boolean aIsVideoCall) { | |||
|
|
|||
| String domain = UrlUtilKt.extractDomain(JitsiCallActivity.JITSI_SERVER_URL); | |||
| if (domain == null) return; //display a toast? | |||
| boolean isAllowed = mSession.getIntegrationManager().isVideoConfDomainAllowed(domain); | |||
| boolean isAllowed = mSession.getIntegrationManager().isNativeWidgetAllowed("jitsi", domain); | |||
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 #3391
Depends on matrix-org/matrix-android-sdk#514
Pull Request Checklist