Skip to content

Commit 027a1a5

Browse files
committed
Fixed VideoPlayer issue
1 parent da68cd7 commit 027a1a5

5 files changed

Lines changed: 18 additions & 12 deletions

File tree

app/src/main/res/values-night/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Main" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
3+
<style name="Theme.Main" parent="Theme.MaterialComponents.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_200</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>

app/src/main/res/values/themes.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="Theme.Main" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
3+
<style name="Theme.Main" parent="Theme.MaterialComponents.DayNight.NoActionBar">
44
<!-- Primary brand color. -->
55
<item name="colorPrimary">@color/purple_500</item>
66
<item name="colorPrimaryVariant">@color/purple_700</item>

foremwebview/src/main/java/com/forem/webview/ForemWebViewSession.kt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package com.forem.webview
22

3+
import android.util.Log
4+
35
class ForemWebViewSession {
46

5-
lateinit var androidWebViewBridge: AndroidWebViewBridge
7+
var androidWebViewBridge: AndroidWebViewBridge? = null
68

79
private var instance: ForemWebViewSession? = null
810

@@ -18,10 +20,16 @@ class ForemWebViewSession {
1820
}
1921

2022
fun videoPlayerPaused() {
21-
androidWebViewBridge.videoPlayerPaused()
23+
if (androidWebViewBridge == null) {
24+
Log.e("ForemWebViewSession", "videoPlayerPaused: androidWebViewBridge is null")
25+
}
26+
androidWebViewBridge?.videoPlayerPaused()
2227
}
2328

2429
fun videoPlayerTimerUpdate(seconds: String) {
25-
androidWebViewBridge.updateTimer(seconds)
30+
if (androidWebViewBridge == null) {
31+
Log.e("ForemWebViewSession", "videoPlayerTimerUpdate: androidWebViewBridge is null")
32+
}
33+
androidWebViewBridge?.updateTimer(seconds)
2634
}
2735
}

foremwebview/src/main/java/com/forem/webview/WebViewFragment.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import android.app.Activity
55
import android.content.Intent
66
import android.net.Uri
77
import android.os.Bundle
8-
import android.util.Log
98
import android.view.LayoutInflater
109
import android.view.View
1110
import android.view.ViewGroup
@@ -93,7 +92,6 @@ class WebViewFragment : Fragment(), FileChooserListener {
9392
@SuppressLint("SetJavaScriptEnabled")
9493
private fun setupWebView(baseUrl: String, needsForemMetaData: Boolean) {
9594

96-
Log.d("TAG","setupWebView: $baseUrl")
9795
// User Agent
9896
val defaultUserAgent = webView!!.settings.userAgentString
9997
val extensionUserAgent = if (baseUrl != WebViewConstants.PASSPORT_URL)

foremwebview/src/main/java/com/forem/webview/video/VideoPlayerActivity.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@ class VideoPlayerActivity : AppCompatActivity(), Player.Listener {
4242

4343
setContentView(R.layout.video_player_activity)
4444

45-
if (ForemWebViewSession().getInstance() == null) {
45+
val foremWebViewSessionInstance = ForemWebViewSession().getInstance()
46+
if (foremWebViewSessionInstance == null) {
4647
finish()
4748
return
4849
} else {
49-
foremWebViewSession = ForemWebViewSession().getInstance()!!
50+
foremWebViewSession = foremWebViewSessionInstance
5051
}
5152

5253
val playerView = findViewById<PlayerView>(R.id.player_view)
@@ -55,9 +56,8 @@ class VideoPlayerActivity : AppCompatActivity(), Player.Listener {
5556
val time = intent.getStringExtra(VIDEO_TIME_INTENT_EXTRA)
5657

5758
val streamUri = Uri.parse(url)
58-
// val dataSourceFactory: DataSource.Factory =
59-
// DefaultHttpDataSourceFactory("DEV-Native-android")
60-
val mediaSource = HlsMediaSource.Factory(DefaultHttpDataSource.Factory()).createMediaSource(MediaItem.fromUri(streamUri))
59+
val mediaSource = HlsMediaSource.Factory(DefaultHttpDataSource.Factory())
60+
.createMediaSource(MediaItem.fromUri(streamUri))
6161

6262
player = SimpleExoPlayer.Builder(this).build()
6363
playerView.player = player

0 commit comments

Comments
 (0)