From 390b1a7addbf7159a00e4ab84df46a2d8b1c6f36 Mon Sep 17 00:00:00 2001
From: Ivan Agosto <spartan360@live.com.mx>
Date: Thu, 24 Oct 2019 14:34:14 -0500
Subject: [PATCH] Warning fixed and upgraded app version

---
 app/build.gradle                                            | 4 ++--
 .../main/java/org/libre/agosto/p2play/ManagerSingleton.kt   | 1 -
 .../java/org/libre/agosto/p2play/ReproductorActivity.kt     | 6 +++---
 app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt    | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3bd4e3a..e9d9a22 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         minSdkVersion 21
         //noinspection OldTargetApi
         targetSdkVersion 27
-        versionCode 5
-        versionName "0.4"
+        versionCode 6
+        versionName "0.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/org/libre/agosto/p2play/ManagerSingleton.kt b/app/src/main/java/org/libre/agosto/p2play/ManagerSingleton.kt
index dee2cbe..b50e2c4 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ManagerSingleton.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ManagerSingleton.kt
@@ -12,7 +12,6 @@ object ManagerSingleton {
     var videos_count: Int = 0
 
     fun Toast(text: String?, context: Context) {
-        if(context == null) { return }
         android.widget.Toast.makeText(context, text, android.widget.Toast.LENGTH_SHORT).show()
     }
 
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 50bca1b..836202e 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -285,12 +285,12 @@ class ReproductorActivity : AppCompatActivity() {
         // Pass null as the parent view because its going in the dialog layout
         builder.setView(dialog)
             // Add action buttons
-            .setPositiveButton(R.string.reportBtn) { dialog, id ->
+            .setPositiveButton(R.string.reportBtn) { _, _ ->
                 val reason = inputReason.text.toString()
                 reportVideo(reason)
             }
-            .setNegativeButton("Cancel") { dialog, id ->
-                dialog.cancel()
+            .setNegativeButton("Cancel") { dialog, _ ->
+                dialog.run { cancel() }
             }
         val alertDialog = builder.create()
         alertDialog.show()
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index cb7f5bb..e411b1b 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -178,7 +178,7 @@ class Videos: Client() {
     fun channelVideos(account: String, start: Int): ArrayList<VideoModel> {
         val count = ManagerSingleton.videos_count
         val params = "start=$start&count=$count"
-        val con = this._newCon("video-channels/$account/videos","GET")
+        val con = this._newCon("video-channels/$account/videos?$params","GET")
         var videos = arrayListOf<VideoModel>()
         try {
             if (con.responseCode == 200) {