Peertube/p2play-app-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix session fetch

Browse Source
This commit is contained in:
Ivan Agosto
2025-02-01 17:40:54 -06:00
parent e5cbedb4ef
commit a530f4c059
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -6,7 +6,6 @@ import android.os.Bundle
import android.util.Log import android.util.Log
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import org.libre.agosto.p2play.activities.MainActivity
import org.libre.agosto.p2play.ajax.Auth import org.libre.agosto.p2play.ajax.Auth
import org.libre.agosto.p2play.helpers.TaskManager import org.libre.agosto.p2play.helpers.TaskManager
import org.libre.agosto.p2play.models.TokenModel import org.libre.agosto.p2play.models.TokenModel
@@ -44,7 +43,6 @@ class SplashActivity : AppCompatActivity() {
} }
private fun checkUser() { private fun checkUser() {
Log.d("was", "Checked")
try { try {
val token = db.getToken() val token = db.getToken()
val user = db.getUser() val user = db.getUser()
@@ -54,21 +52,24 @@ class SplashActivity : AppCompatActivity() {
val clientSecret = settings.getString("client_secret", "")!! val clientSecret = settings.getString("client_secret", "")!!
val task = TaskManager<TokenModel>() val task = TaskManager<TokenModel>()
task.runTask({client.refreshToken(token, clientId, clientSecret)}, { task.runTask(
when (token.status.toString()) { {
"1" -> { client.refreshToken(token, clientId, clientSecret)
db.newToken(it) }, {
ManagerSingleton.token = it when (it.status.toString()) {
ManagerSingleton.user = user "1" -> {
db.newToken(it)
ManagerSingleton.token = it
ManagerSingleton.user = user
}
else -> ManagerSingleton.logout()
} }
else -> ManagerSingleton.logout() startApp()
}
}) })
} else { } else {
ManagerSingleton.logout() ManagerSingleton.logout()
startApp()
} }
startApp()
} catch (err: Exception) { } catch (err: Exception) {
err.printStackTrace() err.printStackTrace()
Thread.sleep(2000) Thread.sleep(2000)