Fix session fetch

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/SplashActivity.kt

@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.PreferenceManager
-import org.libre.agosto.p2play.activities.MainActivity
 import org.libre.agosto.p2play.ajax.Auth
 import org.libre.agosto.p2play.helpers.TaskManager
 import org.libre.agosto.p2play.models.TokenModel
@@ -44,7 +43,6 @@ class SplashActivity : AppCompatActivity() {
     }
 
     private fun checkUser() {
-        Log.d("was", "Checked")
         try {
             val token = db.getToken()
             val user = db.getUser()
@@ -54,8 +52,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
@@ -63,12 +64,12 @@ class SplashActivity : AppCompatActivity() {
                             }
                             else -> ManagerSingleton.logout()
                         }
+                        startApp()
                 })
             } else {
                 ManagerSingleton.logout()
-            }
-
                 startApp()
+            }
         } catch (err: Exception) {
             err.printStackTrace()
             Thread.sleep(2000)