Revert "Update core-telecom dependency and add CALL_BACK intent filte… #406
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,14 +25,11 @@ plugins { | |
|
|
||
| android { | ||
| namespace = "com.example.platform.connectivity.telecom" | ||
| compileSdk = 36 | ||
|
|
||
| defaultConfig { | ||
| minSdk = 23 | ||
| targetSdk = 35 | ||
|
|
||
| testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" | ||
| } | ||
|
|
@@ -42,6 +39,7 @@ android { | |
| } | ||
|
|
||
| dependencies { | ||
| implementation("androidx.core:core-telecom:1.0.1") | ||
|
Contributor
There was a problem hiding this comment. The dependency version is hardcoded here. Please use the version catalog reference instead to maintain consistency with the rest of the project. implementation(libs.androidx.core.telecom) |
||
| implementation(project(mapOf("path" to ":samples:connectivity:audio"))) | ||
|
|
||
| implementation(libs.androidx.activity.compose) | ||
|
|
@@ -52,9 +50,6 @@ dependencies { | |
| implementation(libs.androidx.material3) | ||
| implementation(project(":shared")) | ||
|
|
||
| implementation(libs.accompanist.permissions) | ||
|
|
||
| androidTestImplementation(libs.androidx.test.core) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,21 +25,16 @@ import android.widget.Toast | |
| import androidx.annotation.RequiresApi | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
|
|
@@ -49,7 +44,6 @@ import com.example.platform.connectivity.telecom.call.TelecomCallService | |
| import com.example.platform.connectivity.telecom.model.TelecomCall | ||
| import com.example.platform.connectivity.telecom.model.TelecomCallRepository | ||
| import com.example.platform.shared.PermissionBox | ||
|
|
||
| @RequiresApi(Build.VERSION_CODES.O) | ||
| @Composable | ||
|
|
@@ -110,30 +104,14 @@ private fun TelecomCallOptions() { | |
| "No active call" | ||
| } | ||
| Text(text = title, style = MaterialTheme.typography.titleLarge) | ||
| Button( | ||
| enabled = !hasOngoingCall, | ||
| onClick = { | ||
| Toast.makeText(context, "Incoming call in 2 seconds", Toast.LENGTH_SHORT).show() | ||
| context.launchCall( | ||
| action = TelecomCallService.ACTION_INCOMING_CALL, | ||
| name = "Alice", | ||
| uri = Uri.parse("tel:12345"), | ||
| ) | ||
| }, | ||
| ) { | ||
|
|
@@ -145,8 +123,7 @@ private fun TelecomCallOptions() { | |
| context.launchCall( | ||
| action = TelecomCallService.ACTION_OUTGOING_CALL, | ||
| name = "Bob", | ||
| uri = Uri.parse("tel:54321"), | ||
| ) | ||
| }, | ||
| ) { | ||
|
|
@@ -156,13 +133,12 @@ private fun TelecomCallOptions() { | |
| } | ||
|
|
||
| @RequiresApi(Build.VERSION_CODES.O) | ||
| private fun Context.launchCall(action: String, name: String, uri: Uri) { | ||
| startService( | ||
| Intent(this, TelecomCallService::class.java).apply { | ||
| this.action = action | ||
| putExtra(TelecomCallService.EXTRA_NAME, name) | ||
| putExtra(TelecomCallService.EXTRA_URI, uri) | ||
| }, | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,7 +20,6 @@ import android.app.KeyguardManager | |
| import android.content.Intent | ||
| import android.os.Build | ||
| import android.os.Bundle | ||
| import android.util.Log | ||
| import android.view.WindowManager | ||
| import androidx.activity.ComponentActivity | ||
|
|
@@ -32,8 +31,6 @@ import androidx.compose.material3.MaterialTheme | |
| import androidx.compose.material3.Surface | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.core.content.getSystemService | ||
| import com.example.platform.connectivity.telecom.model.TelecomCallRepository | ||
|
|
||
|
|
||
|
|
@@ -53,8 +50,6 @@ class TelecomCallActivity : ComponentActivity() { | |
| // Set the right flags for a call type activity. | ||
| setupCallActivity() | ||
|
|
||
| setContent { | ||
| MaterialTheme { | ||
| Surface( | ||
|
|
@@ -83,12 +78,6 @@ class TelecomCallActivity : ComponentActivity() { | |
| ) | ||
| } | ||
|
|
||
| /** | ||
| * Enable the calling activity to be shown in the lockscreen and dismiss the keyguard to enable | ||
| * users to answer without unblocking. | ||
|
|
@@ -105,17 +94,8 @@ class TelecomCallActivity : ComponentActivity() { | |
| } | ||
|
|
||
| val keyguardManager = getSystemService<KeyguardManager>() | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && keyguardManager != null) { | ||
| keyguardManager.requestDismissKeyguard(this, null) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,7 +59,6 @@ class TelecomCallService : Service() { | |
| companion object { | ||
| internal const val EXTRA_NAME: String = "extra_name" | ||
| internal const val EXTRA_URI: String = "extra_uri" | ||
| internal const val ACTION_INCOMING_CALL = "incoming_call" | ||
| internal const val ACTION_OUTGOING_CALL = "outgoing_call" | ||
| internal const val ACTION_UPDATE_CALL = "update_call" | ||
|
|
@@ -125,7 +124,6 @@ class TelecomCallService : Service() { | |
| @Suppress("DEPRECATION") | ||
| intent.getParcelableExtra(EXTRA_URI)!! | ||
| } | ||
|
|
||
| scope.launch { | ||
| if (incoming) { | ||
|
|
@@ -135,7 +133,7 @@ class TelecomCallService : Service() { | |
|
|
||
| launch { | ||
| // Register the call with the Telecom stack | ||
| telecomRepository.registerCall(name, uri, incoming) | ||
| } | ||
|
|
||
| if (!incoming) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -25,7 +25,11 @@ import androidx.annotation.RequiresApi | |||||||||||||
| import androidx.core.telecom.CallAttributesCompat | ||||||||||||||
| import androidx.core.telecom.CallControlResult | ||||||||||||||
| import androidx.core.telecom.CallControlScope | ||||||||||||||
| import androidx.core.telecom.CallException | ||||||||||||||
| import androidx.core.telecom.CallsManager | ||||||||||||||
| import kotlinx.coroutines.CoroutineScope | ||||||||||||||
| import kotlinx.coroutines.Dispatchers | ||||||||||||||
| import kotlinx.coroutines.SupervisorJob | ||||||||||||||
|
Comment on lines
+28
to
+32
Contributor
There was a problem hiding this comment. The imports for
Suggested change
|
||||||||||||||
| import kotlinx.coroutines.channels.Channel | ||||||||||||||
| import kotlinx.coroutines.flow.Flow | ||||||||||||||
| import kotlinx.coroutines.flow.MutableStateFlow | ||||||||||||||
|
|
@@ -83,13 +87,8 @@ class TelecomCallRepository(private val callsManager: CallsManager) { | |||||||||||||
| * Register a new call with the provided attributes. | ||||||||||||||
| * Use the [currentCall] StateFlow to receive status updates and process call related actions. | ||||||||||||||
| */ | ||||||||||||||
| suspend fun registerCall(displayName: String, address: Uri, isIncoming: Boolean) { | ||||||||||||||
| // For simplicity we don't support multiple calls | ||||||||||||||
| check(_currentCall.value !is TelecomCall.Registered) { | ||||||||||||||
| "There cannot be more than one call at the same time." | ||||||||||||||
| } | ||||||||||||||
|
|
@@ -98,7 +97,6 @@ class TelecomCallRepository(private val callsManager: CallsManager) { | |||||||||||||
| val attributes = CallAttributesCompat( | ||||||||||||||
| displayName = displayName, | ||||||||||||||
| address = address, | ||||||||||||||
| direction = if (isIncoming) { | ||||||||||||||
| CallAttributesCompat.DIRECTION_INCOMING | ||||||||||||||
| } else { | ||||||||||||||
|
|
@@ -223,7 +221,7 @@ class TelecomCallRepository(private val callsManager: CallsManager) { | |||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| is TelecomCallAction.ToggleMute -> { | ||||||||||||||
| // We cannot programmatically mute the telecom stack. Instead we just update | ||||||||||||||
| // the state of the call and this will start/stop audio capturing. | ||||||||||||||
| updateCurrentCall { | ||||||||||||||
| copy(isMuted = !isMuted) | ||||||||||||||
|
|
||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,9 +27,6 @@ pluginManagement { | |
| gradlePluginPortal() | ||
| } | ||
| } | ||
| dependencyResolutionManagement { | ||
| repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) | ||
| repositories { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of removing the
telecomversion from the catalog, it should be updated to1.0.1. Centralizing dependency versions in the catalog is a best practice that should be maintained even during reverts.