Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ChatApp/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ dependencies {

// App functions
implementation(libs.androidx.appfunctions)
implementation(libs.androidx.appfunctions.service)
ksp(libs.androidx.appfunctions.compiler)

testImplementation(libs.junit)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package com.example.chatapp
import android.app.Application
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.example.chatapp.appfunctions.ChatAppFunctionService
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.test.runTest
import org.junit.Assert.assertNotNull
Expand Down Expand Up @@ -47,7 +48,7 @@ class AppFunctionsViewModelTest {
fun toggleFunction_doesNotCrash() =
runTest {
// Use a potentially real ID from the app
Comment thread
keyboardsurfer marked this conversation as resolved.
viewModel.toggleFunction("com.example.chatapp.appfunctions.AppFunctions#searchContacts", true)
viewModel.toggleFunction(ChatAppFunctionService.FUNCTION_ID_SEARCH_CONTACTS, true)
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.appfunctions.ExecuteAppFunctionRequest
import androidx.appfunctions.ExecuteAppFunctionResponse
import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.example.chatapp.appfunctions.ChatAppFunctionService
import com.example.chatapp.data.MessageRepository
import com.example.chatapp.data.RecipientsRepository
import com.google.common.truth.Truth.assertThat
Expand Down Expand Up @@ -51,8 +52,6 @@ class AppFunctionInstrumentationTest {

@Inject lateinit var recipientsRepository: RecipientsRepository

@Inject lateinit var appFunctions: AppFunctions

private val context: Context = ApplicationProvider.getApplicationContext()
private val appFunctionManager: AppFunctionManager =
checkNotNull(AppFunctionManager.getInstance(context))
Expand All @@ -72,12 +71,12 @@ class AppFunctionInstrumentationTest {
)
.first()
.flatMap { it.appFunctions }
.single { it.id == AppFunctionsIds.SEND_ID }
.single { it.id == ChatAppFunctionService.FUNCTION_ID_SEND }
val testRecipient = recipientsRepository.getAllRecipients().first()
val request =
ExecuteAppFunctionRequest(
targetPackageName = context.packageName,
AppFunctionsIds.SEND_ID,
ChatAppFunctionService.FUNCTION_ID_SEND,
AppFunctionData.Builder(
sendMessageFunctionMetadata.parameters,
sendMessageFunctionMetadata.components,
Expand Down Expand Up @@ -111,12 +110,12 @@ class AppFunctionInstrumentationTest {
)
.first()
.flatMap { it.appFunctions }
.single { it.id == AppFunctionsIds.SEND_ID }
.single { it.id == ChatAppFunctionService.FUNCTION_ID_SEND }
val testRecipient = recipientsRepository.getAllRecipients().first()
val request =
ExecuteAppFunctionRequest(
targetPackageName = context.packageName,
AppFunctionsIds.SEND_ID,
ChatAppFunctionService.FUNCTION_ID_SEND,
AppFunctionData.Builder(
sendMessageFunctionMetadata.parameters,
sendMessageFunctionMetadata.components,
Expand All @@ -142,12 +141,12 @@ class AppFunctionInstrumentationTest {
)
.first()
.flatMap { it.appFunctions }
.single { it.id == AppFunctionsIds.SEARCH_CONTACTS_ID }
.single { it.id == ChatAppFunctionService.FUNCTION_ID_SEARCH_CONTACTS }

val request =
ExecuteAppFunctionRequest(
targetPackageName = context.packageName,
AppFunctionsIds.SEARCH_CONTACTS_ID,
ChatAppFunctionService.FUNCTION_ID_SEARCH_CONTACTS,
AppFunctionData.Builder(
getRecipientsFunctionMetadata.parameters,
getRecipientsFunctionMetadata.components,
Expand All @@ -164,10 +163,10 @@ class AppFunctionInstrumentationTest {
.getAppFunctionDataList(
ExecuteAppFunctionResponse.Success.PROPERTY_RETURN_VALUE,
)
?.map { it.deserialize(AppFunctions.ContactSearchResult::class.java) },
?.map { it.deserialize(ContactSearchResult::class.java) },
)
.containsExactly(
AppFunctions.ContactSearchResult(endpointValue = "1", endpointType = "INDIVIDUAL", displayName = "Alice Smith"),
ContactSearchResult(endpointValue = "1", endpointType = "INDIVIDUAL", displayName = "Alice Smith"),
)
}
}

This file was deleted.

18 changes: 17 additions & 1 deletion ChatApp/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:appfn="http://schemas.android.com/apk/androidx.appfunctions">
xmlns:appfn="http://schemas.android.com/apk/androidx.appfunctions"
xmlns:tools="http://schemas.android.com/tools">

<application
android:name=".ChatApplication"
Expand Down Expand Up @@ -49,6 +50,21 @@
android:host="com.example.chatapp" />
</intent-filter>
</activity>
<service
android:name="com.example.chatapp.appfunctions.ChatAppFunctionService"
android:permission="android.permission.BIND_APP_FUNCTION_SERVICE"
android:exported="true"
tools:targetApi="36">
<property
android:name="android.app.appfunctions.schema"
android:value="app_functions_schema.xsd" />
<property
android:name="android.app.appfunctions.v2"
android:value="chat_app_function_service.xml" />
<intent-filter>
<action android:name="android.app.appfunctions.AppFunctionService" />
</intent-filter>
</service>
<property
android:name="android.app.appfunctions.app_metadata"
android:resource="@xml/app_metadata" />
Expand Down
Loading