From c90f5ed3704bffbcded0a008c3ace9f2198ff908 Mon Sep 17 00:00:00 2001 From: Valere Date: Thu, 30 Jul 2020 17:02:19 +0200 Subject: [PATCH] Fix IllegalArgumentException reported from store on HomeActivity aunch --- CHANGES.md | 2 +- .../features/crypto/quads/SharedSecureStorageViewModel.kt | 4 ++-- .../im/vector/riotx/features/home/HomeActivityViewModel.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6ae8eb3809..7659fa7b6e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,7 @@ Improvements 🙌: - Bugfix 🐛: - - + - Crash reported on playstore for HomeActivity launch (151 reports) SDK API changes ⚠️: - diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt index 314f187ab9..9f1dfe1869 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/quads/SharedSecureStorageViewModel.kt @@ -282,8 +282,8 @@ class SharedSecureStorageViewModel @AssistedInject constructor( @JvmStatic override fun create(viewModelContext: ViewModelContext, state: SharedSecureStorageViewState): SharedSecureStorageViewModel? { val activity: SharedSecureStorageActivity = viewModelContext.activity() - val args: SharedSecureStorageActivity.Args? = activity.intent.getParcelableExtra(MvRx.KEY_ARG) - return args?.let { activity.viewModelFactory.create(state, it) } + val args: SharedSecureStorageActivity.Args = activity.intent.getParcelableExtra(MvRx.KEY_ARG) ?: error("Missing args") + return activity.viewModelFactory.create(state, args) } } } diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt index bd1a5f85ac..ba95d1d43d 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivityViewModel.kt @@ -62,7 +62,7 @@ class HomeActivityViewModel @AssistedInject constructor( override fun create(viewModelContext: ViewModelContext, state: HomeActivityViewState): HomeActivityViewModel? { val activity: HomeActivity = viewModelContext.activity() val args: HomeActivityArgs? = activity.intent.getParcelableExtra(MvRx.KEY_ARG) - return args?.let { activity.viewModelFactory.create(state, it) } + return activity.viewModelFactory.create(state, args ?: HomeActivityArgs(clearNotification = false, accountCreation = false)) } }