StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor: add settings platform service ports
David Nashashe9a44e2498ec
diff --git a/app/src/main/java/com/streamvault/app/settings/AppSettingsBackupFileAdapter.kt b/app/src/main/java/com/streamvault/app/settings/AppSettingsBackupFileAdapter.ktnew file mode 100644index 00000000..2874348b--- /dev/null+++ b/app/src/main/java/com/streamvault/app/settings/AppSettingsBackupFileAdapter.kt@@ -0,0 +1,77 @@+package com.streamvault.app.settings++import android.content.Context+import android.net.Uri+import com.streamvault.app.backup.BackupFileBridge+import com.streamvault.feature.settings.api.SettingsBackupFileCandidate+import com.streamvault.feature.settings.api.SettingsBackupFileHost+import dagger.hilt.android.qualifiers.ApplicationContext+import java.io.File+import javax.inject.Inject+import javax.inject.Singleton++@Singleton+class AppSettingsBackupFileAdapter @Inject constructor(+ @ApplicationContext private val context: Context,+) : SettingsBackupFileHost {+ override val jsonMimeType: String = BackupFileBridge.MIME_TYPE_JSON++ override fun rememberManagedExport(uri: Uri) {+ BackupFileBridge.rememberManagedExport(context, uri)+ }++ override fun listManagedBackups(): List<SettingsBackupFileCandidate> =+ BackupFileBridge.listManagedBackups(context).map(::mapCandidate)++ override fun listPickerFreeBackups(): List<SettingsBackupFileCandidate> =+ BackupFileBridge.listPickerFreeBackups(context).map(::mapCandidate)++ override fun listBackups(directory: File): List<SettingsBackupFileCandidate> =+ BackupFileBridge.listBackupFiles(directory).map { file ->+ mapCandidate(BackupFileBridge.candidateForFile(file))+ }++ override fun createShareExportFile(): File =+ BackupFileBridge.createExportFile(context)++ override fun createPickerFreeExportUri(): Uri? =+ BackupFileBridge.createPickerFreeExportUri(context)++ override fun finishPickerFreeExport(uri: Uri, success: Boolean): Boolean =+ BackupFileBridge.finishPickerFreeExport(context, uri, success)++ override fun createExportFile(directory: File): File =+ BackupFileBridge.createExportFile(directory)++ override fun delete(candidate: SettingsBackupFileCandidate): Boolean =+ BackupFileBridge.deleteManagedBackup(+ context,+ BackupFileBridge.BackupFileCandidate(+ displayName = candidate.displayName,+ uri = candidate.uri,+ lastModifiedMs = candidate.lastModifiedMs,+ )+ )++ override fun providerUri(file: File): Uri =+ BackupFileBridge.providerUriForFile(context, file)++ private fun mapCandidate(candidate: BackupFileBridge.BackupFileCandidate): SettingsBackupFileCandidate =+ SettingsBackupFileCandidate(+ displayName = candidate.displayName,+ uri = candidate.uri,+ lastModifiedMs = candidate.lastModifiedMs,+ sizeBytes = candidateSizeBytes(candidate.uri),+ )++ private fun candidateSizeBytes(uri: Uri): Long =+ when (uri.scheme) {+ "file" -> uri.path?.let(::File)?.length() ?: 0L+ "content" -> runCatching {+ context.contentResolver.openAssetFileDescriptor(uri, "r")?.use { descriptor ->+ descriptor.length.takeIf { it >= 0L } ?: 0L+ } ?: 0L+ }.getOrDefault(0L)+ else -> 0L+ }+}diff --git a/app/src/main/java/com/streamvault/app/settings/AppSettingsBindings.kt b/app/src/main/java/com/streamvault/app/settings/AppSettingsBindings.ktnew file mode 100644index 00000000..c66c7db1--- /dev/null+++ b/app/src/main/java/com/streamvault/app/settings/AppSettingsBindings.kt@@ -0,0 +1,28 @@+package com.streamvault.app.settings++import com.streamvault.feature.settings.api.SettingsAppUpdatePort+import com.streamvault.feature.settings.api.SettingsDiagnosticsPort+import com.streamvault.feature.settings.api.SettingsSurfaceRefreshPort+import dagger.Binds+import dagger.Module+import dagger.hilt.InstallIn+import dagger.hilt.components.SingletonComponent++@Module+@InstallIn(SingletonComponent::class)+abstract class AppSettingsBindings {+ @Binds+ abstract fun bindSettingsSurfaceRefreshPort(+ adapter: AppSettingsSurfaceRefreshAdapter,+ ): SettingsSurfaceRefreshPort++ @Binds+ abstract fun bindSettingsDiagnosticsPort(+ adapter: AppSettingsDiagnosticsAdapter,+ ): SettingsDiagnosticsPort++ @Binds+ abstract fun bindSettingsAppUpdatePort(+ adapter: AppSettingsUpdateAdapter,+ ): SettingsAppUpdatePort+}diff --git a/app/src/main/java/com/streamvault/app/settings/AppSettingsDiagnosticsAdapter.kt b/app/src/main/java/com/streamvault/app/settings/AppSettingsDiagnosticsAdapter.ktnew file mode 100644index 00000000..6207a933--- /dev/null+++ b/app/src/main/java/com/streamvault/app/settings/AppSettingsDiagnosticsAdapter.kt@@ -0,0 +1,27 @@+package com.streamvault.app.settings++import android.content.Context+import com.streamvault.app.diagnostics.CrashReportStore+import com.streamvault.feature.settings.api.SettingsCrashReport+import com.streamvault.feature.settings.api.SettingsDiagnosticsPort+import dagger.hilt.android.qualifiers.ApplicationContext+import javax.inject.Inject+import javax.inject.Singleton++@Singleton+class AppSettingsDiagnosticsAdapter @Inject constructor(+ @ApplicationContext private val context: Context,+) : SettingsDiagnosticsPort {+ override fun latestReport(): SettingsCrashReport? =+ CrashReportStore.latestReport(context)?.let { report ->+ SettingsCrashReport(+ timestamp = report.timestamp,+ exception = report.exception,+ fileName = report.fileName,+ content = report.content,+ )+ }++ override fun deleteLatestReport(): Boolean =+ CrashReportStore.deleteLatestReport(context)+}diff --git a/app/src/main/java/com/streamvault/app/settings/AppSettingsPlatformHost.kt b/app/src/main/java/com/streamvault/app/settings/AppSettingsPlatformHost.ktnew file mode 100644index 00000000..20b864b6--- /dev/null+++ b/app/src/main/java/com/streamvault/app/settings/AppSettingsPlatformHost.kt@@ -0,0 +1,63 @@+package com.streamvault.app.settings++import android.content.Context+import android.net.Uri+import com.streamvault.app.BuildConfig+import com.streamvault.app.device.removableAppStorageDirs+import com.streamvault.app.util.OfficialBuildStatus+import com.streamvault.app.util.OfficialBuildVerifier+import com.streamvault.domain.model.Result+import com.streamvault.feature.settings.api.SettingsBackupFileHost+import com.streamvault.feature.settings.api.SettingsBuildInfo+import com.streamvault.feature.settings.api.SettingsOfficialBuildStatus+import com.streamvault.feature.settings.api.SettingsPlatformHost+import com.streamvault.feature.settings.api.SettingsRecordingPlaybackRequest+import dagger.hilt.android.qualifiers.ApplicationContext+import java.io.File++/**+ * App-owned bridge for Activity and Android framework operations required by+ * the settings feature. The root navigation layer supplies the callbacks for+ * operations that need an Activity or an Activity Result launcher.+ */+class AppSettingsPlatformHost(+ @ApplicationContext private val context: Context,+ override val backupFiles: SettingsBackupFileHost,+ private val playRecordingOperation: (SettingsRecordingPlaybackRequest) -> Unit = {},+ private val shareBackupOperation: (Uri) -> Result<Unit> = {+ Result.error("Backup sharing is unavailable")+ },+ private val shareCrashReportOperation: () -> Result<Unit> = {+ Result.error("Crash-report sharing is unavailable")+ },+) : SettingsPlatformHost {+ override val buildInfo: SettingsBuildInfo = SettingsBuildInfo(+ versionName = BuildConfig.VERSION_NAME,+ versionCode = BuildConfig.VERSION_CODE,+ applicationId = BuildConfig.APPLICATION_ID,+ buildType = BuildConfig.BUILD_TYPE,+ buildTimestampUtc = BuildConfig.BUILD_TIMESTAMP_UTC,+ updateChannel = BuildConfig.APP_UPDATE_CHANNEL,+ )++ override fun officialBuildStatus(): SettingsOfficialBuildStatus =+ when (OfficialBuildVerifier.verify(context).status) {+ OfficialBuildStatus.OFFICIAL -> SettingsOfficialBuildStatus.OFFICIAL+ OfficialBuildStatus.UNOFFICIAL -> SettingsOfficialBuildStatus.UNOFFICIAL+ OfficialBuildStatus.VERIFICATION_UNAVAILABLE ->+ SettingsOfficialBuildStatus.VERIFICATION_UNAVAILABLE+ }++ override fun playRecording(request: SettingsRecordingPlaybackRequest) {+ playRecordingOperation(request)+ }++ override fun shareBackup(uri: Uri): Result<Unit> =+ shareBackupOperation(uri)++ override fun shareCrashReport(): Result<Unit> =+ shareCrashReportOperation()++ override fun removableBackupDirectory(): File? =+ context.removableAppStorageDirs().firstOrNull()+}diff --git a/app/src/main/java/com/streamvault/app/settings/AppSettingsSurfaceRefreshAdapter.kt b/app/src/main/java/com/streamvault/app/settings/AppSettingsSurfaceRefreshAdapter.ktnew file mode 100644index 00000000..872d3b05--- /dev/null+++ b/app/src/main/java/com/streamvault/app/settings/AppSettingsSurfaceRefreshAdapter.kt@@ -0,0 +1,35 @@+package com.streamvault.app.settings++import android.content.Context+import com.streamvault.app.tv.LauncherRecommendationsManager+import com.streamvault.app.tv.WatchNextManager+import com.streamvault.app.tvinput.TvInputCatalogRefreshWorker+import com.streamvault.app.tvinput.TvInputChannelSyncManager+import com.streamvault.feature.settings.api.SettingsSurfaceRefreshPort+import dagger.hilt.android.qualifiers.ApplicationContext+import javax.inject.Inject+import javax.inject.Singleton++@Singleton+class AppSettingsSurfaceRefreshAdapter @Inject constructor(+ @ApplicationContext private val context: Context,+ private val watchNextManager: WatchNextManager,+ private val launcherRecommendationsManager: LauncherRecommendationsManager,+ private val tvInputChannelSyncManager: TvInputChannelSyncManager,+) : SettingsSurfaceRefreshPort {+ override suspend fun refreshWatchNext() {+ watchNextManager.refreshWatchNext()+ }++ override suspend fun refreshRecommendations() {+ launcherRecommendationsManager.refreshRecommendations(force = true)+ }++ override suspend fun refreshTvInputCatalog() {+ tvInputChannelSyncManager.refreshTvInputCatalog()+ }++ override fun enqueueTvInputCatalogRefresh() {+ TvInputCatalogRefreshWorker.enqueue(context)+ }+}diff --git a/app/src/main/java/com/streamvault/app/settings/AppSettingsUpdateAdapter.kt b/app/src/main/java/com/streamvault/app/settings/AppSettingsUpdateAdapter.ktnew file mode 100644index 00000000..e4919bb7--- /dev/null+++ b/app/src/main/java/com/streamvault/app/settings/AppSettingsUpdateAdapter.kt@@ -0,0 +1,93 @@+package com.streamvault.app.settings++import com.streamvault.app.update.AppUpdateDownloadStatus+import com.streamvault.app.update.AppUpdateInstaller+import com.streamvault.app.update.GitHubReleaseChecker+import com.streamvault.app.update.GitHubReleaseInfo+import com.streamvault.app.update.isRemoteVersionNewer+import com.streamvault.domain.model.Result+import com.streamvault.feature.settings.api.SettingsAppUpdatePort+import com.streamvault.feature.settings.api.SettingsReleaseInfo+import com.streamvault.feature.settings.api.SettingsUpdateDownloadState+import com.streamvault.feature.settings.api.SettingsUpdateDownloadStatus+import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.SupervisorJob+import kotlinx.coroutines.flow.MutableStateFlow+import kotlinx.coroutines.flow.StateFlow+import kotlinx.coroutines.launch+import javax.inject.Inject+import javax.inject.Singleton++@Singleton+class AppSettingsUpdateAdapter @Inject constructor(+ private val releaseChecker: GitHubReleaseChecker,+ private val updateInstaller: AppUpdateInstaller,+) : SettingsAppUpdatePort {+ private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)+ private val mappedDownloadState = MutableStateFlow(mapDownloadState(updateInstaller.downloadState.value))++ init {+ scope.launch {+ updateInstaller.downloadState.collect { state ->+ mappedDownloadState.value = mapDownloadState(state)+ }+ }+ }++ override val downloadState: StateFlow<SettingsUpdateDownloadState> = mappedDownloadState++ override fun isRemoteVersionNewer(+ remoteVersionCode: Int?,+ remoteVersionName: String,+ remotePublishedAt: String?,+ ): Boolean = isRemoteVersionNewer(remoteVersionCode, remoteVersionName, remotePublishedAt)++ override suspend fun fetchLatestRelease(): Result<SettingsReleaseInfo> =+ releaseChecker.fetchLatestRelease().map(::mapRelease)++ override suspend fun refreshDownloadState(): SettingsUpdateDownloadState =+ mapDownloadState(updateInstaller.refreshState())++ override suspend fun startDownload(release: SettingsReleaseInfo): Result<Unit> =+ updateInstaller.startDownload(+ GitHubReleaseInfo(+ versionName = release.versionName,+ versionCode = release.versionCode,+ releaseUrl = release.releaseUrl,+ downloadUrl = release.downloadUrl,+ downloadSha256 = release.downloadSha256,+ releaseNotes = release.releaseNotes,+ publishedAt = release.publishedAt,+ )+ )++ override suspend fun installDownloadedUpdate(expectedSha256: String?): Result<Unit> =+ updateInstaller.installDownloadedUpdate(expectedSha256)++ private fun mapRelease(release: GitHubReleaseInfo): SettingsReleaseInfo =+ SettingsReleaseInfo(+ versionName = release.versionName,+ versionCode = release.versionCode,+ releaseUrl = release.releaseUrl,+ downloadUrl = release.downloadUrl,+ downloadSha256 = release.downloadSha256,+ releaseNotes = release.releaseNotes,+ publishedAt = release.publishedAt,+ )++ private fun mapDownloadState(+ state: com.streamvault.app.update.AppUpdateDownloadState,+ ): SettingsUpdateDownloadState =+ SettingsUpdateDownloadState(+ status = when (state.status) {+ AppUpdateDownloadStatus.Idle -> SettingsUpdateDownloadStatus.IDLE+ AppUpdateDownloadStatus.Downloading -> SettingsUpdateDownloadStatus.DOWNLOADING+ AppUpdateDownloadStatus.Downloaded -> SettingsUpdateDownloadStatus.DOWNLOADED+ AppUpdateDownloadStatus.Failed -> SettingsUpdateDownloadStatus.FAILED+ },+ versionName = state.versionName,+ downloadId = state.downloadId,+ installPermissionRequired = state.installPermissionRequired,+ )+}diff --git a/app/src/test/java/com/streamvault/app/settings/AppSettingsAdaptersTest.kt b/app/src/test/java/com/streamvault/app/settings/AppSettingsAdaptersTest.ktnew file mode 100644index 00000000..5194ea65--- /dev/null+++ b/app/src/test/java/com/streamvault/app/settings/AppSettingsAdaptersTest.kt@@ -0,0 +1,70 @@+package com.streamvault.app.settings++import android.net.Uri+import com.google.common.truth.Truth.assertThat+import com.streamvault.domain.model.Result+import com.streamvault.feature.settings.api.SettingsBackupFileCandidate+import com.streamvault.feature.settings.api.SettingsBackupFileHost+import com.streamvault.feature.settings.api.SettingsRecordingPlaybackRequest+import java.io.File+import org.junit.Test+import org.robolectric.RuntimeEnvironment+import org.junit.runner.RunWith+import org.robolectric.RobolectricTestRunner++@RunWith(RobolectricTestRunner::class)+class AppSettingsAdaptersTest {+ @Test+ fun recordingPlaybackAdapterPreservesRequestFields() {+ val requests = mutableListOf<SettingsRecordingPlaybackRequest>()+ val platformHost = AppSettingsPlatformHost(+ context = RuntimeEnvironment.getApplication(),+ backupFiles = fakeBackupFiles(),+ playRecordingOperation = requests::add,+ )+ val request = SettingsRecordingPlaybackRequest(+ streamUrl = "content://recording/7",+ title = "News",+ internalId = 7L,+ providerId = 3L,+ contentType = "MOVIE",+ )++ platformHost.playRecording(request)++ assertThat(requests).containsExactly(request)+ }++ @Test+ fun backupShareAdapterDelegatesUriWithoutChangingIt() {+ val sharedUris = mutableListOf<Uri>()+ val platformHost = AppSettingsPlatformHost(+ context = RuntimeEnvironment.getApplication(),+ backupFiles = fakeBackupFiles(),+ shareBackupOperation = { uri ->+ sharedUris += uri+ Result.success(Unit)+ },+ )+ val uri = Uri.parse("content://backup/42")++ val result = platformHost.shareBackup(uri)++ assertThat(result).isEqualTo(Result.success(Unit))+ assertThat(sharedUris).containsExactly(uri)+ }++ private fun fakeBackupFiles(): SettingsBackupFileHost = object : SettingsBackupFileHost {+ override val jsonMimeType: String = "application/json"+ override fun rememberManagedExport(uri: Uri) = Unit+ override fun listManagedBackups(): List<SettingsBackupFileCandidate> = emptyList()+ override fun listPickerFreeBackups(): List<SettingsBackupFileCandidate> = emptyList()+ override fun listBackups(directory: File): List<SettingsBackupFileCandidate> = emptyList()+ override fun createShareExportFile(): File = File("backup.json")+ override fun createPickerFreeExportUri(): Uri? = null+ override fun finishPickerFreeExport(uri: Uri, success: Boolean): Boolean = success+ override fun createExportFile(directory: File): File = File(directory, "backup.json")+ override fun delete(candidate: SettingsBackupFileCandidate): Boolean = true+ override fun providerUri(file: File): Uri = Uri.fromFile(file)+ }+}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsAppUpdatePort.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsAppUpdatePort.ktnew file mode 100644index 00000000..b25b3857--- /dev/null+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsAppUpdatePort.kt@@ -0,0 +1,43 @@+package com.streamvault.feature.settings.api++import com.streamvault.domain.model.Result+import kotlinx.coroutines.flow.StateFlow++enum class SettingsUpdateDownloadStatus {+ IDLE,+ DOWNLOADING,+ DOWNLOADED,+ FAILED,+}++data class SettingsUpdateDownloadState(+ val status: SettingsUpdateDownloadStatus = SettingsUpdateDownloadStatus.IDLE,+ val versionName: String? = null,+ val downloadId: Long? = null,+ val installPermissionRequired: Boolean = false,+)++data class SettingsReleaseInfo(+ val versionName: String,+ val versionCode: Int?,+ val releaseUrl: String,+ val downloadUrl: String?,+ val downloadSha256: String?,+ val releaseNotes: String,+ val publishedAt: String?,+)++interface SettingsAppUpdatePort {+ val downloadState: StateFlow<SettingsUpdateDownloadState>++ fun isRemoteVersionNewer(+ remoteVersionCode: Int?,+ remoteVersionName: String,+ remotePublishedAt: String?,+ ): Boolean++ suspend fun fetchLatestRelease(): Result<SettingsReleaseInfo>+ suspend fun refreshDownloadState(): SettingsUpdateDownloadState+ suspend fun startDownload(release: SettingsReleaseInfo): Result<Unit>+ suspend fun installDownloadedUpdate(expectedSha256: String?): Result<Unit>+}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsBackupFileHost.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsBackupFileHost.ktnew file mode 100644index 00000000..ba06f8f8--- /dev/null+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsBackupFileHost.kt@@ -0,0 +1,26 @@+package com.streamvault.feature.settings.api++import android.net.Uri+import java.io.File++data class SettingsBackupFileCandidate(+ val displayName: String,+ val uri: Uri,+ val lastModifiedMs: Long,+ val sizeBytes: Long = 0L,+)++interface SettingsBackupFileHost {+ val jsonMimeType: String++ fun rememberManagedExport(uri: Uri)+ fun listManagedBackups(): List<SettingsBackupFileCandidate>+ fun listPickerFreeBackups(): List<SettingsBackupFileCandidate>+ fun listBackups(directory: File): List<SettingsBackupFileCandidate>+ fun createShareExportFile(): File+ fun createPickerFreeExportUri(): Uri?+ fun finishPickerFreeExport(uri: Uri, success: Boolean): Boolean+ fun createExportFile(directory: File): File+ fun delete(candidate: SettingsBackupFileCandidate): Boolean+ fun providerUri(file: File): Uri+}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsDiagnosticsPort.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsDiagnosticsPort.ktnew file mode 100644index 00000000..4be03cfb--- /dev/null+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsDiagnosticsPort.kt@@ -0,0 +1,13 @@+package com.streamvault.feature.settings.api++data class SettingsCrashReport(+ val timestamp: String,+ val exception: String,+ val fileName: String,+ val content: String,+)++interface SettingsDiagnosticsPort {+ fun latestReport(): SettingsCrashReport?+ fun deleteLatestReport(): Boolean+}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsPlatformHost.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsPlatformHost.ktnew file mode 100644index 00000000..012da5d4--- /dev/null+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsPlatformHost.kt@@ -0,0 +1,39 @@+package com.streamvault.feature.settings.api++import android.net.Uri+import com.streamvault.domain.model.Result+import java.io.File++data class SettingsBuildInfo(+ val versionName: String,+ val versionCode: Int,+ val applicationId: String,+ val buildType: String,+ val buildTimestampUtc: Long = 0L,+ val updateChannel: String = "stable",+)++enum class SettingsOfficialBuildStatus {+ OFFICIAL,+ UNOFFICIAL,+ VERIFICATION_UNAVAILABLE,+}++data class SettingsRecordingPlaybackRequest(+ val streamUrl: String,+ val title: String,+ val internalId: Long? = null,+ val providerId: Long? = null,+ val contentType: String? = null,+)++interface SettingsPlatformHost {+ val buildInfo: SettingsBuildInfo+ val backupFiles: SettingsBackupFileHost++ fun officialBuildStatus(): SettingsOfficialBuildStatus+ fun playRecording(request: SettingsRecordingPlaybackRequest)+ fun shareBackup(uri: Uri): Result<Unit>+ fun shareCrashReport(): Result<Unit>+ fun removableBackupDirectory(): File?+}diff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsSurfaceRefreshPort.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsSurfaceRefreshPort.ktnew file mode 100644index 00000000..84193d99--- /dev/null+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/api/SettingsSurfaceRefreshPort.kt@@ -0,0 +1,8 @@+package com.streamvault.feature.settings.api++interface SettingsSurfaceRefreshPort {+ suspend fun refreshWatchNext()+ suspend fun refreshRecommendations()+ suspend fun refreshTvInputCatalog()+ fun enqueueTvInputCatalogRefresh()+}