From f0380d7eff7fe283c3b440276fec27422db24b94 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 17 Mar 2022 07:28:56 +0200 Subject: [PATCH] Fix non-parcelable extras --- .../org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt | 3 +-- .../java/org/koitharu/kotatsu/search/ui/SearchActivity.kt | 4 ++-- .../kotatsu/settings/sources/auth/SourceAuthActivity.kt | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt index bf4965934..fedae2272 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/SimpleSettingsActivity.kt @@ -3,7 +3,6 @@ package org.koitharu.kotatsu.reader.ui import android.content.Context import android.content.Intent import android.os.Bundle -import android.os.Parcelable import android.view.ViewGroup import androidx.core.graphics.Insets import androidx.core.view.updateLayoutParams @@ -71,6 +70,6 @@ class SimpleSettingsActivity : BaseActivity() { fun newSourceSettingsIntent(context: Context, source: MangaSource) = Intent(context, SimpleSettingsActivity::class.java) .setAction(ACTION_SOURCE) - .putExtra(EXTRA_SOURCE, source as Parcelable) + .putExtra(EXTRA_SOURCE, source) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt index 94eadf45c..3d075c1b3 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/SearchActivity.kt @@ -26,7 +26,7 @@ class SearchActivity : BaseActivity(), SearchView.OnQuery override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(ActivitySearchBinding.inflate(layoutInflater)) - source = intent.getParcelableExtra(EXTRA_SOURCE) ?: run { + source = intent.getSerializableExtra(EXTRA_SOURCE) as? MangaSource ?: run { finishAfterTransition() return } @@ -83,7 +83,7 @@ class SearchActivity : BaseActivity(), SearchView.OnQuery fun newIntent(context: Context, source: MangaSource, query: String?) = Intent(context, SearchActivity::class.java) - .putExtra(EXTRA_SOURCE, source as Parcelable) + .putExtra(EXTRA_SOURCE, source) .putExtra(EXTRA_QUERY, query) } } \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt index 53eb9c618..6ad087b80 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/sources/auth/SourceAuthActivity.kt @@ -5,7 +5,6 @@ import android.app.Activity import android.content.Context import android.content.Intent import android.os.Bundle -import android.os.Parcelable import android.view.MenuItem import android.widget.Toast import androidx.activity.result.contract.ActivityResultContract @@ -146,7 +145,7 @@ class SourceAuthActivity : BaseActivity(), BrowserCallba fun newIntent(context: Context, source: MangaSource): Intent { return Intent(context, SourceAuthActivity::class.java) - .putExtra(EXTRA_SOURCE, source as Parcelable) + .putExtra(EXTRA_SOURCE, source) } } } \ No newline at end of file