wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4375 from k9mail/fix_add_identity_crash

Browse source 
Fix crash when trying to create a new identity
This commit is contained in:
cketti 2019-12-17 02:34:59 +01:00 committed by GitHub
commit 615cad7414
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/ui/src/main/java/com/fsck/k9/activity/EditIdentity.kt
View file

@ -15,20 +15,16 @@ class EditIdentity : K9Activity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setLayout(R.layout.edit_identity)
identity = intent.getParcelableExtra(EXTRA_IDENTITY)
identityIndex = intent.getIntExtra(EXTRA_IDENTITY_INDEX, -1)
val accountUuid = intent.getStringExtra(EXTRA_ACCOUNT)
account = Preferences.getPreferences(this).getAccount(accountUuid)
if (identityIndex == -1) {
identity = Identity()
}
setLayout(R.layout.edit_identity)
savedInstanceState?.getParcelable<Identity>(EXTRA_IDENTITY)?.let {
identity = it
identity = when {
savedInstanceState != null -> savedInstanceState.getParcelable(EXTRA_IDENTITY) ?: error("Missing state")
identityIndex != -1 -> intent.getParcelableExtra(EXTRA_IDENTITY) ?: error("Missing argument")
else -> Identity()
}
description.setText(identity.description)