From 59119f274e4499858ee82eeca248ee411b5c3a18 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 21 Nov 2018 16:35:05 +0100 Subject: [PATCH] removing the redundant GsmCall model class --- .../contacts/pro/activities/DialerActivity.kt | 12 ++++++------ .../contacts/pro/extensions/Int.kt | 13 ------------- .../contacts/pro/models/GsmCall.kt | 13 ------------- .../contacts/pro/services/MyCallService.kt | 5 ++--- 4 files changed, 8 insertions(+), 35 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Int.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/GsmCall.kt diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt index 226f4c96..f3fca781 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/DialerActivity.kt @@ -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() } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Int.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Int.kt deleted file mode 100644 index a150ed86..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/extensions/Int.kt +++ /dev/null @@ -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 -} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/GsmCall.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/GsmCall.kt deleted file mode 100644 index db23b0e0..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/GsmCall.kt +++ /dev/null @@ -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 - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/MyCallService.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/MyCallService.kt index 2c2da69a..71fa844d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/MyCallService.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/services/MyCallService.kt @@ -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) } }