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

removing the redundant GsmCall model class

Browse Source
This commit is contained in:
tibbi 2018-11-21 16:35:05 +01:00
parent 957d525c1a
commit 59119f274e
4 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt
View File

@ -12,12 +12,12 @@ import android.net.Uri
import android.os.Bundle
import android.os.Handler
import android.os.PowerManager
import android.telecom.Call
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.helpers.*
import com.simplemobiletools.contacts.pro.models.Contact
import com.simplemobiletools.contacts.pro.models.GsmCall
import com.simplemobiletools.contacts.pro.objects.CallManager
import com.simplemobiletools.contacts.pro.services.DialerCallService
import kotlinx.android.synthetic.main.activity_dialer.*
@ -51,7 +51,7 @@ class DialerActivity : SimpleActivity(), SensorEventListener {
isIncomingCall = true
number = intent.getStringExtra(CALLER_NUMBER)
initViews()
updateUI(intent.getSerializableExtra(CALL_STATUS) as GsmCall.Status)
updateUI(intent.getIntExtra(CALL_STATUS, 0))
tryFillingOtherEndsName()
startNotificationService()
} else {
@ -79,7 +79,7 @@ class DialerActivity : SimpleActivity(), SensorEventListener {
private val messageReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
if (intent.extras?.containsKey(CALL_STATUS) == true) {
updateUI(intent.getSerializableExtra(CALL_STATUS) as GsmCall.Status)
updateUI(intent.getIntExtra(CALL_STATUS, 0))
}
}
}
@ -134,10 +134,10 @@ class DialerActivity : SimpleActivity(), SensorEventListener {
}
}
private fun updateUI(status: GsmCall.Status) {
private fun updateUI(status: Int) {
when (status) {
GsmCall.Status.ACTIVE -> statusActive()
GsmCall.Status.DISCONNECTED -> statusDisconnected()
Call.STATE_ACTIVE -> statusActive()
Call.STATE_DISCONNECTED -> statusDisconnected()
}
}

13
app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Int.kt
View File

@ -1,13 +0,0 @@
package com.simplemobiletools.contacts.pro.extensions
import android.telecom.Call
import com.simplemobiletools.contacts.pro.models.GsmCall
fun Int.toGsmCallStatus() = when (this) {
Call.STATE_ACTIVE -> GsmCall.Status.ACTIVE
Call.STATE_RINGING -> GsmCall.Status.RINGING
Call.STATE_CONNECTING -> GsmCall.Status.CONNECTING
Call.STATE_DIALING -> GsmCall.Status.DIALING
Call.STATE_DISCONNECTED -> GsmCall.Status.DISCONNECTED
else -> GsmCall.Status.UNKNOWN
}

13
app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/GsmCall.kt
View File

@ -1,13 +0,0 @@
package com.simplemobiletools.contacts.pro.models
data class GsmCall(val status: GsmCall.Status) {
enum class Status {
CONNECTING,
DIALING,
RINGING,
ACTIVE,
DISCONNECTED,
UNKNOWN
}
}

5
app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/MyCallService.kt
View File

@ -7,7 +7,6 @@ import android.telecom.Call
import android.telecom.InCallService
import androidx.localbroadcastmanager.content.LocalBroadcastManager
import com.simplemobiletools.contacts.pro.activities.DialerActivity
import com.simplemobiletools.contacts.pro.extensions.toGsmCallStatus
import com.simplemobiletools.contacts.pro.helpers.CALLER_NUMBER
import com.simplemobiletools.contacts.pro.helpers.CALL_STATUS
import com.simplemobiletools.contacts.pro.helpers.DIALER_INTENT_FILTER
@ -30,7 +29,7 @@ class MyCallService : InCallService() {
Intent(this, DialerActivity::class.java).apply {
action = INCOMING_CALL
putExtra(CALL_STATUS, call.state.toGsmCallStatus())
putExtra(CALL_STATUS, call.state)
putExtra(CALLER_NUMBER, callerNumber)
startActivity(this)
}
@ -52,7 +51,7 @@ class MyCallService : InCallService() {
private fun sendCallToActivity(call: Call) {
Intent(DIALER_INTENT_FILTER).apply {
putExtra(CALL_STATUS, call.state.toGsmCallStatus())
putExtra(CALL_STATUS, call.state)
LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(this)
}
}