kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 08:20:32 +05:30
Code Issues Projects Releases Wiki Activity

Fix auth api url when restoring backup in welcome page

Browse Source
This commit is contained in:
Bnyro 2023-07-06 13:47:03 +02:00
parent 406520a703
commit eb1382e154
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/github/libretube/ui/activities/WelcomeActivity.kt
View File

@ -8,6 +8,7 @@ import androidx.activity.viewModels
import androidx.core.view.isGone import androidx.core.view.isGone
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.github.libretube.R import com.github.libretube.R
import com.github.libretube.api.RetrofitInstance
import com.github.libretube.constants.PreferenceKeys import com.github.libretube.constants.PreferenceKeys
import com.github.libretube.databinding.ActivityWelcomeBinding import com.github.libretube.databinding.ActivityWelcomeBinding
import com.github.libretube.helpers.BackupHelper import com.github.libretube.helpers.BackupHelper
@ -31,7 +32,8 @@ class WelcomeActivity : BaseActivity() {
BackupHelper.restoreAdvancedBackup(this@WelcomeActivity, uri) BackupHelper.restoreAdvancedBackup(this@WelcomeActivity, uri)
// only skip the welcome activity if the restored backup contains an instance // only skip the welcome activity if the restored backup contains an instance
if (PreferenceHelper.getString(PreferenceKeys.FETCH_INSTANCE, "").isNotEmpty()) { val instancePref = PreferenceHelper.getString(PreferenceKeys.FETCH_INSTANCE, "")
if (instancePref.isNotEmpty()) {
withContext(Dispatchers.Main) { startMainActivity() } withContext(Dispatchers.Main) { startMainActivity() }
} }
} }
@ -72,6 +74,9 @@ class WelcomeActivity : BaseActivity() {
} }
private fun startMainActivity() { private fun startMainActivity() {
// refresh the api urls since they have changed likely
RetrofitInstance.initialize()
RetrofitInstance.lazyMgr.reset()
val mainActivityIntent = Intent(this@WelcomeActivity, MainActivity::class.java) val mainActivityIntent = Intent(this@WelcomeActivity, MainActivity::class.java)
startActivity(mainActivityIntent) startActivity(mainActivityIntent)
finish() finish()

1
app/src/main/java/com/github/libretube/ui/dialogs/LoginDialog.kt
View File

@ -65,6 +65,7 @@ class LoginDialog(
private fun signIn(username: String, password: String, createNewAccount: Boolean = false) { private fun signIn(username: String, password: String, createNewAccount: Boolean = false) {
val login = Login(username, password) val login = Login(username, password)
Log.e("url", RetrofitInstance.authUrl)
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
val response = try { val response = try {
if (createNewAccount) { if (createNewAccount) {