Skip to content

Commit 2f6cdc6

Browse files
authored
Merge pull request #1847 from vector-im/feature/crash_store_mvrx
Fix IllegalArgumentException reported from store on HomeActivity aunch
2 parents 1f226ca + c90f5ed commit 2f6cdc6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Improvements 🙌:
88
-
99

1010
Bugfix 🐛:
11-
-
11+
- Crash reported on playstore for HomeActivity launch (151 reports)
1212

1313
SDK API changes ⚠️:
1414
-

vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,8 @@ class SharedSecureStorageViewModel @AssistedInject constructor(
282282
@JvmStatic
283283
override fun create(viewModelContext: ViewModelContext, state: SharedSecureStorageViewState): SharedSecureStorageViewModel? {
284284
val activity: SharedSecureStorageActivity = viewModelContext.activity()
285-
val args: SharedSecureStorageActivity.Args? = activity.intent.getParcelableExtra(MvRx.KEY_ARG)
286-
return args?.let { activity.viewModelFactory.create(state, it) }
285+
val args: SharedSecureStorageActivity.Args = activity.intent.getParcelableExtra(MvRx.KEY_ARG) ?: error("Missing args")
286+
return activity.viewModelFactory.create(state, args)
287287
}
288288
}
289289
}

vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class HomeActivityViewModel @AssistedInject constructor(
6262
override fun create(viewModelContext: ViewModelContext, state: HomeActivityViewState): HomeActivityViewModel? {
6363
val activity: HomeActivity = viewModelContext.activity()
6464
val args: HomeActivityArgs? = activity.intent.getParcelableExtra(MvRx.KEY_ARG)
65-
return args?.let { activity.viewModelFactory.create(state, it) }
65+
return activity.viewModelFactory.create(state, args ?: HomeActivityArgs(clearNotification = false, accountCreation = false))
6666
}
6767
}
6868

0 commit comments

Comments
 (0)