From eeb20f1f9d0905290b65afbbfd7bea2e44311b41 Mon Sep 17 00:00:00 2001 From: Ivan Agosto Date: Mon, 25 Mar 2024 19:57:22 -0600 Subject: [PATCH] Update function name to the correct one --- .../java/org/libre/agosto/p2play/ReproductorActivity.kt | 8 +++----- .../org/libre/agosto/p2play/adapters/VideosAdapter.kt | 2 +- app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt | 3 --- .../java/org/libre/agosto/p2play/models/VideoModel.kt | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt index dae39e9..c5df116 100644 --- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt +++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt @@ -1,8 +1,6 @@ package org.libre.agosto.p2play import android.annotation.SuppressLint -import android.app.Activity -import android.content.DialogInterface import android.content.Intent import android.content.pm.ActivityInfo import android.graphics.Bitmap @@ -96,7 +94,7 @@ class ReproductorActivity : AppCompatActivity() { userImg.setOnClickListener { val intent = Intent(this, ChannelActivity::class.java) - intent.putExtra("channel", video.getAccount()) + intent.putExtra("channel", video.getChannel()) startActivity(intent) } } @@ -105,7 +103,7 @@ class ReproductorActivity : AppCompatActivity() { AsyncTask.execute { if (Looper.myLooper() == null) Looper.prepare() - val res = this._actions.subscribe(ManagerSingleton.token.token, video.getAccount()) + val res = this._actions.subscribe(ManagerSingleton.token.token, video.getChannel()) if (res == 1) { runOnUiThread { ManagerSingleton.Toast(getString(R.string.subscribeMsg), this) @@ -119,7 +117,7 @@ class ReproductorActivity : AppCompatActivity() { AsyncTask.execute { if (Looper.myLooper() == null) Looper.prepare() - val res = this._actions.unSubscribe(ManagerSingleton.token.token, video.getAccount()) + val res = this._actions.unSubscribe(ManagerSingleton.token.token, video.getChannel()) if (res == 1) { runOnUiThread { ManagerSingleton.Toast(getString(R.string.unSubscribeMsg), this) diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt index 51f1de9..ecfde66 100644 --- a/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt +++ b/app/src/main/java/org/libre/agosto/p2play/adapters/VideosAdapter.kt @@ -66,7 +66,7 @@ class VideosAdapter(private val myDataset: ArrayList) : holder.userImg.setOnClickListener { val intent = Intent(holder.context, ChannelActivity::class.java) - intent.putExtra("channel", myDataset[position].getAccount()) + intent.putExtra("channel", myDataset[position].getChannel()) holder.context.startActivity(intent) } diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt index 2a948f5..8a16998 100644 --- a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt +++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt @@ -10,8 +10,6 @@ import java.net.HttpURLConnection import java.net.URL open class Client { - - protected fun _newCon(uri: String, method: String, token: String = ""): HttpURLConnection { val url = URL("https://${ManagerSingleton.url}/api/v1/$uri") val con = url.openConnection() as HttpURLConnection @@ -67,5 +65,4 @@ open class Client { return keys } - } \ No newline at end of file diff --git a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt index 6059a94..74fce53 100644 --- a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt +++ b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt @@ -19,7 +19,7 @@ class VideoModel( var userHost: String = "", var nameChannel: String = "" ):Serializable { - fun getAccount(): String { + fun getChannel(): String { return "$nameChannel@$userHost" }