Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
liberty-chat-android
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
12
Issues
12
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liberty
chat
liberty-chat-android
Commits
81643749
Commit
81643749
authored
Nov 21, 2019
by
Valere
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor due to SDK changes for native_widgets
parent
20b8eed0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
7 deletions
+5
-7
vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt
...ain/java/im/vector/activity/IntegrationManagerActivity.kt
+1
-1
vector/src/main/java/im/vector/activity/VectorRoomActivity.java
.../src/main/java/im/vector/activity/VectorRoomActivity.java
+1
-1
vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
...or/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
+2
-2
vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
...va/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
+1
-3
No files found.
vector/src/main/java/im/vector/activity/IntegrationManagerActivity.kt
View file @
81643749
...
...
@@ -259,7 +259,7 @@ class IntegrationManagerActivity : AbstractWidgetActivity() {
Log
.
d
(
LOG_TAG
,
"Received request to get widget in room "
+
mRoom
!!
.
roomId
)
val
widgets
=
widget
Manager
.
getActiveWidgets
(
mSession
,
mRoom
)
val
widgets
=
Widgets
Manager
.
getActiveWidgets
(
mSession
,
mRoom
)
val
responseData
=
ArrayList
<
JsonDict
<
Any
>>()
for
(
widget
in
widgets
)
{
...
...
vector/src/main/java/im/vector/activity/VectorRoomActivity.java
View file @
81643749
...
...
@@ -1772,7 +1772,7 @@ public class VectorRoomActivity extends MXCActionBarActivity implements
String
domain
=
UrlUtilKt
.
extractDomain
(
JitsiCallActivity
.
JITSI_SERVER_URL
);
if
(
domain
==
null
)
return
;
//display a toast?
boolean
isAllowed
=
mSession
.
getIntegrationManager
().
is
VideoConfDomainAllowed
(
domain
);
boolean
isAllowed
=
mSession
.
getIntegrationManager
().
is
NativeWidgetAllowed
(
"jitsi"
,
domain
);
if
(
isAllowed
)
{
final
Intent
intent
=
new
Intent
(
this
,
JitsiCallActivity
.
class
);
intent
.
putExtra
(
JitsiCallActivity
.
EXTRA_WIDGET_ID
,
widget
);
...
...
vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetPermissionViewModel.kt
View file @
81643749
...
...
@@ -54,7 +54,7 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
})
}
else
{
session
.
integrationManager
.
se
VideoConfDomainAllowed
(
state
.
widgetDomain
session
.
integrationManager
.
se
tNativeWidgetDomainAllowed
(
"jitsi"
,
state
.
widgetDomain
?:
""
,
true
,
object
:
SimpleApiCallback
<
Void
?>()
{
override
fun
onSuccess
(
info
:
Void
?)
{
...
...
@@ -75,7 +75,7 @@ class RoomWidgetPermissionViewModel(val session: MXSession, val widget: Widget,
})
}
else
{
session
.
integrationManager
.
se
VideoConfDomainAllowed
(
state
.
widgetDomain
session
.
integrationManager
.
se
tNativeWidgetDomainAllowed
(
"jitsi"
,
state
.
widgetDomain
?:
""
,
false
,
object
:
SimpleApiCallback
<
Void
?>()
{
override
fun
onSuccess
(
info
:
Void
?)
{
...
...
vector/src/main/java/im/vector/fragments/roomwidgets/RoomWidgetViewModel.kt
View file @
81643749
...
...
@@ -165,9 +165,7 @@ class RoomWidgetViewModel(initialState: RoomWidgetViewModelState, val widget: Wi
val
isAllowed
=
session
?.
integrationManager
?.
getKnownWidgetPermissions
()
?.
find
{
it
.
stateEventId
==
widget
.
widgetEvent
.
eventId
}
?.
allowed
?.
isWidgetAllowed
(
widget
.
widgetEvent
.
eventId
)
?:
false
if
(!
isAllowed
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment