avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 19:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Parsing clipboard's content for repo URI (closes #244)

Browse Source
This commit is contained in:
machiav3lli 2022-07-08 02:22:08 +02:00
parent 93dec1ed7a
commit 1750020e20
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/kotlin/com/machiav3lli/fdroid/database/entity/Repository.kt
View File

@ -66,13 +66,14 @@ data class Repository(
fun newRepository( fun newRepository(
address: String = "", address: String = "",
fallbackName: String = "",
fingerprint: String = "", fingerprint: String = "",
authentication: String = "", authentication: String = "",
): Repository { ): Repository {
val name = try { val name = try {
URL(address).let { "${it.host}${it.path}" } URL(address).let { "${it.host}${it.path}" }
} catch (e: Exception) { } catch (e: Exception) {
address fallbackName
} }
return Repository( return Repository(
address = address, address = address,

2
src/main/kotlin/com/machiav3lli/fdroid/ui/fragments/EditRepositorySheetX.kt
View File

@ -151,7 +151,7 @@ class EditRepositorySheetX() : FullscreenBottomSheetDialogFragment(), RepoManage
override fun updateSheet() { override fun updateSheet() {
val repository = viewModel.repo.value val repository = viewModel.repo.value
if (repository == null) { if (repository == null || repository.address == "") {
val clipboardManager = val clipboardManager =
requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
val text = clipboardManager.primaryClip val text = clipboardManager.primaryClip

2
src/main/kotlin/com/machiav3lli/fdroid/ui/viewmodels/RepositoriesViewModelX.kt
View File

@ -63,7 +63,7 @@ class RepositoriesViewModelX(val repositoryDao: RepositoryDao) : ViewModel() {
} }
private suspend fun addNewRepository(): Long = withContext(Dispatchers.IO) { private suspend fun addNewRepository(): Long = withContext(Dispatchers.IO) {
repositoryDao.insert(newRepository(address = "new repository")) repositoryDao.insert(newRepository(fallbackName = "new repository"))
repositoryDao.latestAddedId() repositoryDao.latestAddedId()
} }