Merge pull request #82 from shunf4/fix/notifperm_crash

fix "You can't request ViewModel before onCreate call error" in NotificationPermissionActivity
This commit is contained in:
Shinokuni 2020-11-07 18:43:12 +01:00 committed by GitHub
commit 28dda2f1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions

View File

@ -3,6 +3,7 @@ package com.readrops.app.notifications
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.MenuItem import android.view.MenuItem
import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
@ -23,7 +24,7 @@ import org.koin.androidx.viewmodel.ext.android.getViewModel
class NotificationPermissionActivity : AppCompatActivity() { class NotificationPermissionActivity : AppCompatActivity() {
private lateinit var binding: ActivityNotificationPermissionBinding private lateinit var binding: ActivityNotificationPermissionBinding
private val viewModel = getViewModel<NotificationPermissionViewModel>() private lateinit var viewModel: NotificationPermissionViewModel
private var adapter: NotificationPermissionListAdapter? = null private var adapter: NotificationPermissionListAdapter? = null
private var isFirstCheck = true private var isFirstCheck = true
@ -40,6 +41,7 @@ class NotificationPermissionActivity : AppCompatActivity() {
val accountId = intent.getIntExtra(ACCOUNT_ID, 0) val accountId = intent.getIntExtra(ACCOUNT_ID, 0)
viewModel = getViewModel<NotificationPermissionViewModel>()
viewModel.getAccount(accountId).observe(this, Observer { account -> viewModel.getAccount(accountId).observe(this, Observer { account ->
viewModel.account = account viewModel.account = account