prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non-parcelable extras

Browse Source
This commit is contained in:
Koitharu
2022-03-17 07:28:56 +02:00
parent 11356484b2
commit f0380d7eff
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt
View File

@@ -3,7 +3,6 @@ package org.koitharu.kotatsu.reader.ui
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.graphics.Insets import androidx.core.graphics.Insets
import androidx.core.view.updateLayoutParams import androidx.core.view.updateLayoutParams
@@ -71,6 +70,6 @@ class SimpleSettingsActivity : BaseActivity<ActivitySettingsSimpleBinding>() {
fun newSourceSettingsIntent(context: Context, source: MangaSource) = fun newSourceSettingsIntent(context: Context, source: MangaSource) =
Intent(context, SimpleSettingsActivity::class.java) Intent(context, SimpleSettingsActivity::class.java)
.setAction(ACTION_SOURCE) .setAction(ACTION_SOURCE)
.putExtra(EXTRA_SOURCE, source as Parcelable) .putExtra(EXTRA_SOURCE, source)
} }
} }

4
app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt
View File

@@ -26,7 +26,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(ActivitySearchBinding.inflate(layoutInflater)) setContentView(ActivitySearchBinding.inflate(layoutInflater))
source = intent.getParcelableExtra(EXTRA_SOURCE) ?: run { source = intent.getSerializableExtra(EXTRA_SOURCE) as? MangaSource ?: run {
finishAfterTransition() finishAfterTransition()
return return
} }
@@ -83,7 +83,7 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>(), SearchView.OnQuery
fun newIntent(context: Context, source: MangaSource, query: String?) = fun newIntent(context: Context, source: MangaSource, query: String?) =
Intent(context, SearchActivity::class.java) Intent(context, SearchActivity::class.java)
.putExtra(EXTRA_SOURCE, source as Parcelable) .putExtra(EXTRA_SOURCE, source)
.putExtra(EXTRA_QUERY, query) .putExtra(EXTRA_QUERY, query)
} }
} }

3
app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt
View File

@@ -5,7 +5,6 @@ import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.os.Parcelable
import android.view.MenuItem import android.view.MenuItem
import android.widget.Toast import android.widget.Toast
import androidx.activity.result.contract.ActivityResultContract import androidx.activity.result.contract.ActivityResultContract
@@ -146,7 +145,7 @@ class SourceAuthActivity : BaseActivity<ActivityBrowserBinding>(), BrowserCallba
fun newIntent(context: Context, source: MangaSource): Intent { fun newIntent(context: Context, source: MangaSource): Intent {
return Intent(context, SourceAuthActivity::class.java) return Intent(context, SourceAuthActivity::class.java)
.putExtra(EXTRA_SOURCE, source as Parcelable) .putExtra(EXTRA_SOURCE, source)
} }
} }
} }