fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-17 12:00:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

move contact init at ViewContactActivity to resume

Browse Source
This commit is contained in:
tibbi 2018-02-10 23:42:11 +01:00
parent dd678cc7d2
commit dd6771fd0c
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt
View File

@ -32,7 +32,6 @@ import java.text.SimpleDateFormat
import java.util.*
abstract class ContactActivity : SimpleActivity() {
var isEditActivity = false
var contact: Contact? = null
var currentContactPhotoPath = ""

24
app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt
View File

@ -24,16 +24,11 @@ class ViewContactActivity : ContactActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_view_contact)
isEditActivity = false
}
handlePermission(PERMISSION_READ_CONTACTS) {
if (it) {
initContact()
} else {
toast(R.string.no_contacts_permission)
finish()
}
}
override fun onResume() {
super.onResume()
tryInitContact()
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
@ -51,6 +46,17 @@ class ViewContactActivity : ContactActivity() {
return true
}
private fun tryInitContact() {
handlePermission(PERMISSION_READ_CONTACTS) {
if (it) {
initContact()
} else {
toast(R.string.no_contacts_permission)
finish()
}
}
}
private fun initContact() {
var contactId = intent.getIntExtra(CONTACT_ID, 0)
val action = intent.action