Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC-Android
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mike Landry
VLC-Android
Commits
78ce29cb
Commit
78ce29cb
authored
3 years ago
by
Nicolas Pomepuy
Browse files
Options
Downloads
Patches
Plain Diff
Add the dialog listener to display the certificate errors for streams
Fixes #1998
parent
d557e562
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
application/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
+14
-3
14 additions, 3 deletions
...vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
with
14 additions
and
3 deletions
application/vlc-android/src/org/videolan/vlc/gui/SecondaryActivity.kt
+
14
−
3
View file @
78ce29cb
...
...
@@ -24,8 +24,6 @@
package
org.videolan.vlc.gui
import
android.content.Intent
import
android.content.res.Configuration
import
android.os.Build
import
android.os.Bundle
import
android.view.MenuItem
import
android.view.View
...
...
@@ -35,6 +33,7 @@ import androidx.fragment.app.Fragment
import
com.google.android.material.appbar.AppBarLayout
import
kotlinx.coroutines.ExperimentalCoroutinesApi
import
kotlinx.coroutines.ObsoleteCoroutinesApi
import
org.videolan.libvlc.Dialog
import
org.videolan.medialibrary.interfaces.Medialibrary
import
org.videolan.medialibrary.interfaces.media.MediaWrapper
import
org.videolan.resources.AndroidDevices
...
...
@@ -54,14 +53,18 @@ import org.videolan.vlc.gui.helpers.UiTools
import
org.videolan.vlc.gui.network.MRLPanelFragment
import
org.videolan.vlc.gui.video.VideoGridFragment
import
org.videolan.vlc.reloadLibrary
import
org.videolan.vlc.util.DialogDelegate
import
org.videolan.vlc.util.IDialogManager
import
org.videolan.vlc.util.isSchemeNetwork
@ExperimentalCoroutinesApi
@ObsoleteCoroutinesApi
class
SecondaryActivity
:
ContentActivity
()
{
class
SecondaryActivity
:
ContentActivity
()
,
IDialogManager
{
private
var
fragment
:
Fragment
?
=
null
override
val
displayTitle
=
true
private
val
dialogsDelegate
=
DialogDelegate
()
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
...
...
@@ -91,8 +94,16 @@ class SecondaryActivity : ContentActivity() {
.
add
(
R
.
id
.
fragment_placeholder
,
fragment
!!
)
.
commit
()
}
dialogsDelegate
.
observeDialogs
(
this
,
this
)
}
override
fun
fireDialog
(
dialog
:
Dialog
)
{
DialogActivity
.
dialog
=
dialog
startActivity
(
Intent
(
DialogActivity
.
KEY_DIALOG
,
null
,
this
,
DialogActivity
::
class
.
java
))
}
override
fun
dialogCanceled
(
dialog
:
Dialog
?)
{}
override
fun
forceLoadVideoFragment
()
{
val
fragmentId
=
intent
.
getStringExtra
(
KEY_FRAGMENT
)
fetchSecondaryFragment
(
fragmentId
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment