release v0.8.4

app/build.gradle

@@ -9,8 +9,8 @@ android {
         compileSdk 35
         minSdkVersion 26
         targetSdkVersion 32
-        versionCode 13
+        versionCode 15
-        versionName "0.8.2"
+        versionName "0.8.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/org/libre/agosto/p2play/MainActivity.kt

@@ -66,11 +66,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         binding.content.mini.miniPlayerAuthor.setOnClickListener { this.resumeVideo() }
         // binding.content.mini.setOnClickListener { this.resumeVideo() }
         binding.content.mini.miniPlayPause.setOnClickListener { this.playPausePlayer() }
-
-        Handler().postDelayed({
-            // Title for nav_bar
-            binding.navView.getHeaderView(0).findViewById<TextView>(R.id.side_emailTxt).text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
-        }, 2000)
     }
 
     // Generic function for set data to RecyclerView
@@ -374,10 +369,10 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
     }
 
     private fun setSideData() {
+        val headerView = binding.navView.getHeaderView(0)
         if (ManagerSingleton.user.status == 1) {
             binding.navView.menu.findItem(R.id.ml).isVisible = true
 
-            val headerView = binding.navView.getHeaderView(0)
             headerView.findViewById<TextView>(R.id.side_usernameTxt).text = ManagerSingleton.user.username
             headerView.findViewById<TextView>(R.id.side_emailTxt).text = ManagerSingleton.user.email
             if (ManagerSingleton.user.avatar != "" && headerView.findViewById<ImageView>(R.id.side_imageView) != null) {
@@ -394,6 +389,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             }
         } else {
             binding.navView.menu.findItem(R.id.ml).isVisible = false
+            headerView.findViewById<TextView>(R.id.side_emailTxt).text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
         }
     }
 

app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt

@@ -10,6 +10,7 @@ import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Looper
+import android.util.Log
 import android.view.View
 import android.view.WindowManager
 import android.webkit.WebChromeClient
@@ -139,7 +140,10 @@ class ReproductorActivity : AppCompatActivity() {
         }
 
         AsyncTask.execute {
-            videoPlayback = this.clientVideo.getVideo(this.video.uuid)
+            videoPlayback = if (ManagerSingleton.token.status == 1)
+                this.clientVideo.getVideo(this.video.uuid, ManagerSingleton.token.token)
+            else
+                this.clientVideo.getVideo(this.video.uuid)
             // TODO: Make this configurable
             // val bufferSize = 1024 * 1024 // 1mb
             // val allocator = DefaultAllocator(true, bufferSize)

app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt

@@ -46,7 +46,6 @@ class SplashActivity : AppCompatActivity() {
     }
 
     private fun checkUser() {
-        Log.d("was", "Checked")
         try {
             val token = db.getToken()
             val user = db.getUser()
@@ -56,8 +55,11 @@ class SplashActivity : AppCompatActivity() {
                 val clientSecret = settings.getString("client_secret", "")!!
                 val task = TaskManager<TokenModel>()
 
-                task.runTask({client.refreshToken(token, clientId, clientSecret)}, {
+                task.runTask(
-                    when (token.status.toString()) {
+                    {
+                        client.refreshToken(token, clientId, clientSecret)
+                    }, {
+                        when (it.status.toString()) {
                             "1" -> {
                                 db.newToken(it)
                                 ManagerSingleton.token = it
@@ -65,12 +67,12 @@ class SplashActivity : AppCompatActivity() {
                             }
                             else -> ManagerSingleton.logout()
                         }
+                        startApp()
                 })
             } else {
                 ManagerSingleton.logout()
-            }
-
                 startApp()
+            }
         } catch (err: Exception) {
             err.printStackTrace()
             Thread.sleep(2000)

app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt

@@ -9,7 +9,7 @@ import java.net.HttpURLConnection
 import java.net.URL
 
 open class Client {
-    protected fun newCon(uri: String, method: String, token: String = ""): HttpURLConnection {
+    protected fun newCon(uri: String, method: String, token: String? = null): HttpURLConnection {
         val url = URL("https://${ManagerSingleton.url}/api/v1/$uri")
         val con = url.openConnection() as HttpURLConnection
 
@@ -17,7 +17,7 @@ open class Client {
         con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
         con.setRequestProperty("Accept", "*/*")
 
-        if (token != "") {
+        if (token !== null) {
             con.setRequestProperty("Authorization", "Bearer $token")
         }
 

app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt

@@ -201,8 +201,8 @@ class Videos : Client() {
         return this.getVideos(start, "-likes")
     }
 
-    fun getVideo(uuid: String): VideoModel {
+    fun getVideo(uuid: String, token: String? = null): VideoModel {
-        val con = this.newCon("videos/$uuid", "GET")
+        val con = this.newCon("videos/$uuid", "GET", token)
         val video = VideoModel()
         try {
             if (con.responseCode == 200) {