Merge "Update groups after domain verifiation." into main (2883526f) · Commits · e / os / android_frameworks_base

packages/StatementService/Android.bp

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,8 +38,10 @@ android_app {
		"StatementServiceParser",
		"androidx.appcompat_appcompat",
		"androidx.collection_collection-ktx",
		"androidx.room_room-runtime",
		"androidx.work_work-runtime",
		"androidx.work_work-runtime-ktx",
		"kotlinx-coroutines-android",
		],
		plugins: ["androidx.room_room-compiler-plugin"],
		}

packages/StatementService/src/com/android/statementservice/database/Converters.kt

0 → 100644

+130 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.statementservice.database

		import android.content.UriRelativeFilter
		import android.content.UriRelativeFilterGroup
		import android.util.JsonReader
		import androidx.room.TypeConverter
		import org.json.JSONArray
		import org.json.JSONObject
		import java.io.StringReader
		import java.util.ArrayList

		class Converters {
		companion object {
		private const val ACTION_NAME = "action"
		private const val FILTERS_NAME = "filters"
		private const val URI_PART_NAME = "uriPart"
		private const val PATTERN_TYPE_NAME = "patternType"
		private const val FILTER_NAME = "filter"
		}

		@TypeConverter
		fun groupsToJson(groups: List<UriRelativeFilterGroup>): String {
		val json = JSONArray()
		for (group in groups) {
		json.put(groupToJson(group))
		}
		return json.toString()
		}

		@TypeConverter
		fun stringToGroups(json: String): List<UriRelativeFilterGroup> {
		val groups = ArrayList<UriRelativeFilterGroup>()
		StringReader(json).use { stringReader ->
		JsonReader(stringReader).use { reader ->
		reader.beginArray()
		while (reader.hasNext()) {
		groups.add(parseGroup(reader))
		}
		reader.endArray()
		}
		}
		return groups
		}

		private fun groupToJson(group: UriRelativeFilterGroup): JSONObject {
		val jsonObject = JSONObject()
		jsonObject.put(ACTION_NAME, group.action)
		val filters = JSONArray()
		for (filter in group.uriRelativeFilters) {
		filters.put(filterToJson(filter))
		}
		jsonObject.put(FILTERS_NAME, filters)
		return jsonObject
		}

		private fun filterToJson(filter: UriRelativeFilter): JSONObject {
		val jsonObject = JSONObject()
		jsonObject.put(URI_PART_NAME, filter.uriPart)
		jsonObject.put(PATTERN_TYPE_NAME, filter.patternType)
		jsonObject.put(FILTER_NAME, filter.filter)
		return jsonObject
		}

		private fun parseGroup(reader: JsonReader): UriRelativeFilterGroup {
		val jsonObject = JSONObject()
		reader.beginObject()
		while (reader.hasNext()) {
		val name = reader.nextName()
		when (name) {
		ACTION_NAME -> jsonObject.put(ACTION_NAME, reader.nextInt())
		FILTERS_NAME -> jsonObject.put(FILTERS_NAME, parseFilters(reader))
		else -> reader.skipValue()
		}
		}
		reader.endObject()

		val group = UriRelativeFilterGroup(jsonObject.getInt(ACTION_NAME))
		val filters = jsonObject.getJSONArray(FILTERS_NAME)
		for (i in 0 until filters.length()) {
		val filter = filters.getJSONObject(i)
		group.addUriRelativeFilter(UriRelativeFilter(
		filter.getInt(URI_PART_NAME),
		filter.getInt(PATTERN_TYPE_NAME),
		filter.getString(FILTER_NAME)
		))
		}
		return group
		}

		private fun parseFilters(reader: JsonReader): JSONArray {
		val filters = JSONArray()
		reader.beginArray()
		while (reader.hasNext()) {
		filters.put(parseFilter(reader))
		}
		reader.endArray()
		return filters
		}

		private fun parseFilter(reader: JsonReader): JSONObject {
		reader.beginObject()
		val jsonObject = JSONObject()
		while (reader.hasNext()) {
		val name = reader.nextName()
		when (name) {
		URI_PART_NAME, PATTERN_TYPE_NAME -> jsonObject.put(name, reader.nextInt())
		FILTER_NAME -> jsonObject.put(name, reader.nextString())
		else -> reader.skipValue()
		}
		}
		reader.endObject()
		return jsonObject
		}
		}
		No newline at end of file

packages/StatementService/src/com/android/statementservice/database/DomainGroups.kt

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.statementservice.database

		import android.content.UriRelativeFilterGroup
		import androidx.room.Entity

		@Entity(primaryKeys = ["packageName", "domain"])
		data class DomainGroups(
		val packageName: String,
		val domain: String,
		val groups: List<UriRelativeFilterGroup>
		)
		No newline at end of file

packages/StatementService/src/com/android/statementservice/database/DomainGroupsDao.kt

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.statementservice.database

		import androidx.room.Dao
		import androidx.room.Insert
		import androidx.room.Query

		@Dao
		interface DomainGroupsDao {
		@Query("SELECT * FROM DomainGroups WHERE packageName = :packageName")
		fun getDomainGroups(packageName: String): List<DomainGroups>

		@Insert
		fun insertDomainGroups(vararg domainGroups: DomainGroups)

		@Query("DELETE FROM DomainGroups WHERE packageName = :packageName AND domain = :domain")
		fun clear(packageName: String, domain: String)

		@Query("DELETE FROM DomainGroups WHERE packageName = :packageName")
		fun clear(packageName: String)
		}
		No newline at end of file

packages/StatementService/src/com/android/statementservice/database/DomainGroupsDatabase.kt

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.statementservice.database

		import android.content.Context
		import androidx.room.Database
		import androidx.room.Room
		import androidx.room.RoomDatabase
		import androidx.room.TypeConverters

		@Database(entities = [DomainGroups::class], version = 1)
		@TypeConverters(Converters::class)
		abstract class DomainGroupsDatabase : RoomDatabase() {
		companion object {
		private const val DATABASE_NAME = "domain-groups"
		@Volatile
		private var instance: DomainGroupsDatabase? = null

		fun getInstance(context: Context) = instance ?: synchronized(this) {
		instance ?: Room.databaseBuilder(
		context,
		DomainGroupsDatabase::class.java, DATABASE_NAME
		).build().also { instance = it }
		}
		}
		abstract fun domainGroupsDao(): DomainGroupsDao
		}
		No newline at end of file