Skip to content

Commit 3cd8773

Browse files
Fix remaining deprecation warnings
1 parent 952ef83 commit 3cd8773

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

app/src/main/java/org/wikipedia/commons/ImagePreviewViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ import org.wikipedia.Constants
1313
import org.wikipedia.dataclient.ServiceFactory
1414
import org.wikipedia.descriptions.DescriptionEditActivity
1515
import org.wikipedia.extensions.parcelable
16+
import org.wikipedia.extensions.serializable
1617
import org.wikipedia.suggestededits.PageSummaryForEdit
1718
import org.wikipedia.util.Resource
1819

1920
class ImagePreviewViewModel(bundle: Bundle) : ViewModel() {
20-
2121
private val handler = CoroutineExceptionHandler { _, throwable ->
2222
_uiState.value = Resource.Error(throwable)
2323
}
2424
var pageSummaryForEdit = bundle.parcelable<PageSummaryForEdit>(ImagePreviewDialog.ARG_SUMMARY)!!
25-
var action = bundle.getSerializable(ImagePreviewDialog.ARG_ACTION) as DescriptionEditActivity.Action?
25+
var action = bundle.serializable<DescriptionEditActivity.Action>(ImagePreviewDialog.ARG_ACTION)
2626

2727
private val _uiState = MutableStateFlow(Resource<FilePage>())
2828
val uiState = _uiState.asStateFlow()

app/src/main/java/org/wikipedia/edit/templates/TemplatesSearchViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import org.wikipedia.dataclient.ServiceFactory
1717
import org.wikipedia.dataclient.WikiSite
1818
import org.wikipedia.dataclient.mwapi.TemplateDataResponse
1919
import org.wikipedia.extensions.parcelable
20+
import org.wikipedia.extensions.serializable
2021
import org.wikipedia.page.Namespace
2122
import org.wikipedia.page.PageTitle
2223
import org.wikipedia.settings.Prefs
2324

2425
class TemplatesSearchViewModel(bundle: Bundle) : ViewModel() {
25-
26-
val invokeSource = bundle.getSerializable(Constants.INTENT_EXTRA_INVOKE_SOURCE) as Constants.InvokeSource
26+
val invokeSource = bundle.serializable<Constants.InvokeSource>(Constants.INTENT_EXTRA_INVOKE_SOURCE)
2727
val wikiSite = bundle.parcelable<WikiSite>(Constants.ARG_WIKISITE)!!
2828
val isFromDiff = bundle.getBoolean(TemplatesSearchActivity.EXTRA_FROM_DIFF, false)
2929
var searchQuery: String? = null

app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayViewModel.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.wikipedia.Constants
1212
import org.wikipedia.dataclient.ServiceFactory
1313
import org.wikipedia.dataclient.WikiSite
1414
import org.wikipedia.extensions.parcelable
15+
import org.wikipedia.extensions.serializable
1516
import org.wikipedia.util.DateUtil
1617
import org.wikipedia.util.Resource
1718
import java.util.Calendar
@@ -25,7 +26,7 @@ class OnThisDayViewModel(bundle: Bundle) : ViewModel() {
2526
val wikiSite = bundle.parcelable<WikiSite>(Constants.ARG_WIKISITE)!!
2627
val age = bundle.getInt(OnThisDayActivity.EXTRA_AGE, 0)
2728
val year = bundle.getInt(OnThisDayActivity.EXTRA_YEAR, 0)
28-
val invokeSource = bundle.getSerializable(Constants.INTENT_EXTRA_INVOKE_SOURCE) as Constants.InvokeSource
29+
val invokeSource = bundle.serializable<Constants.InvokeSource>(Constants.INTENT_EXTRA_INVOKE_SOURCE)
2930
val date = DateUtil.getDefaultDateFor(age)
3031

3132
private val _uiState = MutableStateFlow(Resource<List<OnThisDay.Event>>())

app/src/main/java/org/wikipedia/feed/suggestededits/SuggestedEditsCardItemViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import org.wikipedia.dataclient.ServiceFactory
1414
import org.wikipedia.dataclient.WikiSite
1515
import org.wikipedia.dataclient.mwapi.MwQueryPage
1616
import org.wikipedia.descriptions.DescriptionEditActivity
17+
import org.wikipedia.extensions.serializable
1718
import org.wikipedia.page.Namespace
1819
import org.wikipedia.page.PageTitle
1920
import org.wikipedia.suggestededits.PageSummaryForEdit
@@ -22,9 +23,8 @@ import org.wikipedia.util.Resource
2223
import org.wikipedia.util.StringUtil
2324

2425
class SuggestedEditsCardItemViewModel(bundle: Bundle) : ViewModel() {
25-
2626
val age = bundle.getInt(SuggestedEditsCardItemFragment.EXTRA_AGE)
27-
var cardActionType = bundle.getSerializable(SuggestedEditsCardItemFragment.EXTRA_ACTION_TYPE) as DescriptionEditActivity.Action
27+
var cardActionType = bundle.serializable<DescriptionEditActivity.Action>(SuggestedEditsCardItemFragment.EXTRA_ACTION_TYPE)
2828
var sourceSummaryForEdit: PageSummaryForEdit? = null
2929
var targetSummaryForEdit: PageSummaryForEdit? = null
3030
var imageTagPage: MwQueryPage? = null

app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsCardsViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import org.wikipedia.WikipediaApp
1313
import org.wikipedia.dataclient.ServiceFactory
1414
import org.wikipedia.dataclient.mwapi.SiteMatrix
1515
import org.wikipedia.descriptions.DescriptionEditActivity
16+
import org.wikipedia.extensions.serializable
1617
import org.wikipedia.util.Resource
1718

1819
class SuggestedEditsCardsViewModel(bundle: Bundle) : ViewModel() {
19-
2020
var langFromCode = WikipediaApp.instance.languageState.appLanguageCode
2121
var langToCode = WikipediaApp.instance.languageState.appLanguageCodes.getOrElse(1) { "" }
22-
var action = bundle.getSerializable(Constants.INTENT_EXTRA_ACTION) as DescriptionEditActivity.Action
22+
var action = bundle.serializable<DescriptionEditActivity.Action>(Constants.INTENT_EXTRA_ACTION)
2323

2424
private val _uiState = MutableStateFlow(Resource<List<String>>())
2525
val uiState = _uiState.asStateFlow()

0 commit comments

Comments
 (0)