mirror of
https://github.com/SimpleMobileTools/Simple-Contacts.git
synced 2025-02-07 23:28:52 +01:00
removing the redundant GsmCall model class
This commit is contained in:
parent
957d525c1a
commit
59119f274e
@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
}
|
@ -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
|
||||
}
|
||||
}
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user