MaintainTeam/LastPipeBender
1
0
Fork 0
mirror of https://github.com/MaintainTeam/LastPipeBender.git synced 2025-02-28 21:38:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wrap logs in BuildConfig.DEBUG

Browse source
This commit is contained in:
Stypox 2025-01-27 12:10:49 +01:00 • committed by AudricV
parent f856bd9306
commit 2b183a0576
No known key found for this signature in database
GPG key ID: DA92EC7905614198
2 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenProviderImpl.kt
View file

@ -4,6 +4,7 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.Log import android.util.Log
import org.schabi.newpipe.App import org.schabi.newpipe.App
import org.schabi.newpipe.BuildConfig
import org.schabi.newpipe.extractor.NewPipe import org.schabi.newpipe.extractor.NewPipe
import org.schabi.newpipe.extractor.services.youtube.PoTokenProvider import org.schabi.newpipe.extractor.services.youtube.PoTokenProvider
import org.schabi.newpipe.extractor.services.youtube.PoTokenResult import org.schabi.newpipe.extractor.services.youtube.PoTokenResult
@ -39,7 +40,7 @@ object PoTokenProviderImpl : PoTokenProvider {
val (poTokenGenerator, visitorData, streamingPot, hasBeenRecreated) = val (poTokenGenerator, visitorData, streamingPot, hasBeenRecreated) =
synchronized(WebPoTokenGenLock) { synchronized(WebPoTokenGenLock) {
val shouldRecreate = webPoTokenGenerator == null || forceRecreate || val shouldRecreate = webPoTokenGenerator == null || forceRecreate ||
webPoTokenGenerator!!.isExpired() webPoTokenGenerator!!.isExpired()
if (shouldRecreate) { if (shouldRecreate) {
// close the current webPoTokenGenerator on the main thread // close the current webPoTokenGenerator on the main thread
@ -84,7 +85,14 @@ object PoTokenProviderImpl : PoTokenProvider {
} }
} }
Log.e(TAG, "success($videoId) $playerPot,web.gvs+$streamingPot;visitor_data=$visitorData") if (BuildConfig.DEBUG) {
Log.d(
TAG,
"poToken for $videoId: playerPot=$playerPot, " +
"streamingPot=$streamingPot, visitor_data=$visitorData"
)
}
return PoTokenResult(visitorData, playerPot, streamingPot) return PoTokenResult(visitorData, playerPot, streamingPot)
} }

24
app/src/main/java/org/schabi/newpipe/util/potoken/PoTokenWebView.kt
View file

@ -13,6 +13,7 @@ import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.core.SingleEmitter import io.reactivex.rxjava3.core.SingleEmitter
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.schedulers.Schedulers import io.reactivex.rxjava3.schedulers.Schedulers
import org.schabi.newpipe.BuildConfig
import org.schabi.newpipe.DownloaderImpl import org.schabi.newpipe.DownloaderImpl
import java.time.Instant import java.time.Instant
@ -100,7 +101,9 @@ class PoTokenWebView private constructor(
*/ */
@JavascriptInterface @JavascriptInterface
fun onJsInitializationError(error: String) { fun onJsInitializationError(error: String) {
Log.e(TAG, "Initialization error from JavaScript: $error") if (BuildConfig.DEBUG) {
Log.e(TAG, "Initialization error from JavaScript: $error")
}
onInitializationErrorCloseAndCancel(PoTokenException(error)) onInitializationErrorCloseAndCancel(PoTokenException(error))
} }
@ -110,12 +113,16 @@ class PoTokenWebView private constructor(
*/ */
@JavascriptInterface @JavascriptInterface
fun onRunBotguardResult(botguardResponse: String) { fun onRunBotguardResult(botguardResponse: String) {
Log.e(TAG, "botguardResponse: $botguardResponse") if (BuildConfig.DEBUG) {
Log.d(TAG, "botguardResponse: $botguardResponse")
}
makeJnnPaGoogleapisRequest( makeJnnPaGoogleapisRequest(
"https://jnn-pa.googleapis.com/\$rpc/google.internal.waa.v1.Waa/GenerateIT", "https://jnn-pa.googleapis.com/\$rpc/google.internal.waa.v1.Waa/GenerateIT",
"[ \"$REQUEST_KEY\", \"$botguardResponse\" ]", "[ \"$REQUEST_KEY\", \"$botguardResponse\" ]",
) { responseBody -> ) { responseBody ->
Log.e(TAG, "GenerateIT response: $responseBody") if (BuildConfig.DEBUG) {
Log.d(TAG, "GenerateIT response: $responseBody")
}
webView.evaluateJavascript( webView.evaluateJavascript(
"""(async function() { """(async function() {
try { try {
@ -194,7 +201,9 @@ class PoTokenWebView private constructor(
*/ */
@JavascriptInterface @JavascriptInterface
fun onObtainPoTokenError(identifier: String, error: String) { fun onObtainPoTokenError(identifier: String, error: String) {
Log.e(TAG, "obtainPoToken error from JavaScript: $error") if (BuildConfig.DEBUG) {
Log.e(TAG, "obtainPoToken error from JavaScript: $error")
}
popPoTokenEmitter(identifier)?.onError(PoTokenException(error)) popPoTokenEmitter(identifier)?.onError(PoTokenException(error))
} }
@ -204,8 +213,9 @@ class PoTokenWebView private constructor(
*/ */
@JavascriptInterface @JavascriptInterface
fun onObtainPoTokenResult(identifier: String, poToken: String) { fun onObtainPoTokenResult(identifier: String, poToken: String) {
Log.e(TAG, "identifier=$identifier") if (BuildConfig.DEBUG) {
Log.e(TAG, "poToken=$poToken") Log.d(TAG, "Generated poToken: identifier=$identifier poToken=$poToken")
}
popPoTokenEmitter(identifier)?.onSuccess(poToken) popPoTokenEmitter(identifier)?.onSuccess(poToken)
} }
@ -298,7 +308,7 @@ class PoTokenWebView private constructor(
private const val GOOGLE_API_KEY = "AIzaSyDyT5W0Jh49F30Pqqtyfdf7pDLFKLJoAnw" private const val GOOGLE_API_KEY = "AIzaSyDyT5W0Jh49F30Pqqtyfdf7pDLFKLJoAnw"
private const val REQUEST_KEY = "O43z0dpjhgX20SCx4KAo" private const val REQUEST_KEY = "O43z0dpjhgX20SCx4KAo"
private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " + private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.3" "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.3"
override fun newPoTokenGenerator(context: Context): Single<PoTokenGenerator> = override fun newPoTokenGenerator(context: Context): Single<PoTokenGenerator> =
Single.create { emitter -> Single.create { emitter ->