rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: activity opening twice

Browse source
This commit is contained in:
rebelonion 2024-04-14 22:39:30 -05:00
parent a8ff4fdc26
commit bf33f5d9c8
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/ani/dantotsu/MainActivity.kt
View file

@ -299,6 +299,7 @@ class MainActivity : AppCompatActivity() {
} }
} }
var launched = false
intent.extras?.let { extras -> intent.extras?.let { extras ->
val fragmentToLoad = extras.getString("FRAGMENT_TO_LOAD") val fragmentToLoad = extras.getString("FRAGMENT_TO_LOAD")
val mediaId = extras.getInt("mediaId", -1) val mediaId = extras.getInt("mediaId", -1)
@ -311,6 +312,7 @@ class MainActivity : AppCompatActivity() {
putExtra("mediaId", mediaId) putExtra("mediaId", mediaId)
putExtra("commentId", commentId) putExtra("commentId", commentId)
} }
launched = true
startActivity(detailIntent) startActivity(detailIntent)
} else if (fragmentToLoad == "FEED" && activityId != -1) { } else if (fragmentToLoad == "FEED" && activityId != -1) {
val feedIntent = Intent(this, FeedActivity::class.java).apply { val feedIntent = Intent(this, FeedActivity::class.java).apply {
@ -318,6 +320,7 @@ class MainActivity : AppCompatActivity() {
putExtra("activityId", activityId) putExtra("activityId", activityId)
} }
launched = true
startActivity(feedIntent) startActivity(feedIntent)
} else if (fragmentToLoad == "NOTIFICATIONS" && activityId != -1) { } else if (fragmentToLoad == "NOTIFICATIONS" && activityId != -1) {
Logger.log("MainActivity, onCreate: $activityId") Logger.log("MainActivity, onCreate: $activityId")
@ -325,6 +328,7 @@ class MainActivity : AppCompatActivity() {
putExtra("FRAGMENT_TO_LOAD", "NOTIFICATIONS") putExtra("FRAGMENT_TO_LOAD", "NOTIFICATIONS")
putExtra("activityId", activityId) putExtra("activityId", activityId)
} }
launched = true
startActivity(notificationIntent) startActivity(notificationIntent)
} }
} }
@ -378,7 +382,7 @@ class MainActivity : AppCompatActivity() {
} }
} }
//Load Data //Load Data
if (!load) { if (!load && !launched) {
scope.launch(Dispatchers.IO) { scope.launch(Dispatchers.IO) {
model.loadMain(this@MainActivity) model.loadMain(this@MainActivity)
val id = intent.extras?.getInt("mediaId", 0) val id = intent.extras?.getInt("mediaId", 0)