Refactor

testpress · Dec 13, 2022 · 4d52321 · 4d52321
1 parent d5a87c5
commit 4d52321
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/player/src/main/java/com/tpstream/player/TpStreamPlayer.kt b/player/src/main/java/com/tpstream/player/TpStreamPlayer.kt
@@ -53,8 +53,8 @@ class TpStreamPlayerImpl(val player: ExoPlayer, val context: Context) : TpStream
 
     private fun getMediaSourceFactory(): MediaSource.Factory {
         val mediaSourceFactory = DefaultMediaSourceFactory(context)
-            .setDataSourceFactory(VideoDownloadManager(context).build(params))
-        if (!videoInfo.dashUrl.equals("") && offlineVideoInfo == null) {
+            .setDataSourceFactory(VideoDownloadManager(context).build())
+        if (!(videoInfo.dashUrl == null || videoInfo.dashUrl.equals("")) && offlineVideoInfo == null) {
             mediaSourceFactory.setDrmSessionManagerProvider {
                 DefaultDrmSessionManager.Builder().build(
                     CustomHttpDrmMediaCallback(context, params)

diff --git a/player/src/main/java/com/tpstream/player/VideoDownloadManager.kt b/player/src/main/java/com/tpstream/player/VideoDownloadManager.kt
@@ -33,15 +33,8 @@ class VideoDownloadManager {
         return downloadManager!!
     }
 
-    val params = TpInitParams.Builder()
-        .setOrgCode("demoveranda")
-        .setVideoId("o7pOsacWaJt")
-        .setAccessToken("143a0c71-567e-4ecd-b22d-06177228c25b")
-        .build()
-
     @Synchronized
     private fun initializeDownloadManger() {
-        Log.d("TAG", "initializeDownloadManger: ")
         downloadManager = DownloadManager(
             context,
             getDatabaseProvider(context),
@@ -59,21 +52,20 @@ class VideoDownloadManager {
         return databaseProvider
     }
 
-    fun getHttpDataSourceFactory(tpInitParams: TpInitParams? = null): DataSource.Factory {
-        Log.d("TAG", "getHttpDataSourceFactory: ${tpInitParams?.videoId}")
+    fun getHttpDataSourceFactory(): DataSource.Factory {
         val okHttpClient = OkHttpClient.Builder()
-            .addInterceptor(VideoPlayerInterceptor(context,tpInitParams))
+            .addInterceptor(VideoPlayerInterceptor(context))
             .build()
         httpDataSourceFactory = OkHttpDataSource.Factory(okHttpClient)
         return httpDataSourceFactory
     }
 
-    fun build(tpInitParams: TpInitParams? = null): CacheDataSource.Factory {
+    fun build(): CacheDataSource.Factory {
         Log.d("TAG", "build: ")
         val cache = VideoDownloadManager(context).getDownloadCache()
         return CacheDataSource.Factory()
             .setCache(cache)
-            .setUpstreamDataSourceFactory(getHttpDataSourceFactory(tpInitParams))
+            .setUpstreamDataSourceFactory(getHttpDataSourceFactory())
             .setCacheWriteDataSinkFactory(null)
             .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
     }

diff --git a/player/src/main/java/com/tpstream/player/VideoPlayerInterceptor.kt b/player/src/main/java/com/tpstream/player/VideoPlayerInterceptor.kt
@@ -1,24 +1,20 @@
 package com.tpstream.player
 
 import android.content.Context
-import android.util.Log
 import okhttp3.Interceptor
 import okhttp3.Response
 
-class VideoPlayerInterceptor(val context: Context, private val params: TpInitParams? = null) : Interceptor {
+class VideoPlayerInterceptor(val context: Context) : Interceptor {
 
-    //private lateinit var params: TpInitParams
+    private lateinit var params: TpInitParams
 
     override fun intercept(chain: Interceptor.Chain): Response {
-        //params = Params.params
-
-        Log.d("TAG", "intercept: ")
-
         var request = chain.request()
 
         if(request.url.toString().contains("encryption_key")) {
+            params = Params.params
             request = request.newBuilder()
-                .url( "https://${params?.orgCode}.testpress.in/api/v2.5/encryption_key/${params?.videoId}/?access_token=${params?.accessToken}")
+                .url( "https://${params.orgCode}.testpress.in/api/v2.5/encryption_key/${params.videoId}/?access_token=${params.accessToken}")
                 .build()
         }
         return chain.proceed(request)