From 1750020e203f65fd364fd1253c4b88e20cfa5292 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 8 Jul 2022 02:22:08 +0200 Subject: [PATCH] Fix: Parsing clipboard's content for repo URI (closes #244) --- .../com/machiav3lli/fdroid/database/entity/Repository.kt | 3 ++- .../machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt | 2 +- .../machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt index afe8fd7e..6e874b69 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt @@ -66,13 +66,14 @@ data class Repository( fun newRepository( address: String = "", + fallbackName: String = "", fingerprint: String = "", authentication: String = "", ): Repository { val name = try { URL(address).let { "${it.host}${it.path}" } } catch (e: Exception) { - address + fallbackName } return Repository( address = address, diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt index 9824f266..e576a7f3 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt @@ -151,7 +151,7 @@ class EditRepositorySheetX() : FullscreenBottomSheetDialogFragment(), RepoManage override fun updateSheet() { val repository = viewModel.repo.value - if (repository == null) { + if (repository == null || repository.address == "") { val clipboardManager = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val text = clipboardManager.primaryClip diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt index f6598cbf..d42c8849 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt @@ -63,7 +63,7 @@ class RepositoriesViewModelX(val repositoryDao: RepositoryDao) : ViewModel() { } private suspend fun addNewRepository(): Long = withContext(Dispatchers.IO) { - repositoryDao.insert(newRepository(address = "new repository")) + repositoryDao.insert(newRepository(fallbackName = "new repository")) repositoryDao.latestAddedId() }