kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 06:10:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #3026 from Isira-Seneviratne/URL_validation

Browse Source 
Simplify custom instance URL validation.
This commit is contained in:
Bnyro 2023-02-12 09:09:42 +01:00 committed by GitHub
commit 32533ca11c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/com/github/libretube/ui/dialogs/CustomInstanceDialog.kt
View File

@ -11,56 +11,37 @@ import com.github.libretube.db.DatabaseHolder.Database
import com.github.libretube.db.obj.CustomInstance import com.github.libretube.db.obj.CustomInstance
import com.github.libretube.extensions.query import com.github.libretube.extensions.query
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import java.net.URL import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
class CustomInstanceDialog : DialogFragment() { class CustomInstanceDialog : DialogFragment() {
private lateinit var binding: DialogCustomInstanceBinding
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
binding = DialogCustomInstanceBinding.inflate(layoutInflater) val binding = DialogCustomInstanceBinding.inflate(layoutInflater)
binding.cancel.setOnClickListener { binding.cancel.setOnClickListener {
dismiss() dismiss()
} }
binding.addInstance.setOnClickListener { binding.addInstance.setOnClickListener {
val customInstance = CustomInstance( val instanceName = binding.instanceName.text.toString()
name = binding.instanceName.text.toString(), val apiUrl = binding.instanceApiUrl.text.toString()
apiUrl = binding.instanceApiUrl.text.toString(), val frontendUrl = binding.instanceFrontendUrl.text.toString()
frontendUrl = binding.instanceFrontendUrl.text.toString()
)
if (
customInstance.name != "" &&
customInstance.apiUrl != "" &&
customInstance.frontendUrl != ""
) {
try {
// check whether the URL is valid, otherwise catch
URL(customInstance.apiUrl).toURI()
URL(customInstance.frontendUrl).toURI()
if (instanceName.isNotEmpty() && apiUrl.isNotEmpty() && frontendUrl.isNotEmpty()) {
if (apiUrl.toHttpUrlOrNull() != null && frontendUrl.toHttpUrlOrNull() != null) {
query { query {
Database.customInstanceDao().insertAll(customInstance) Database.customInstanceDao()
.insertAll(CustomInstance(instanceName, apiUrl, frontendUrl))
} }
ActivityCompat.recreate(requireActivity()) ActivityCompat.recreate(requireActivity())
dismiss() dismiss()
} catch (e: Exception) { } else {
// invalid URL Toast.makeText(requireContext(), R.string.invalid_url, Toast.LENGTH_SHORT)
Toast.makeText( .show()
context,
getString(R.string.invalid_url),
Toast.LENGTH_SHORT
).show()
} }
} else { } else {
// at least one empty input // at least one empty input
Toast.makeText( Toast.makeText(requireContext(), R.string.empty_instance, Toast.LENGTH_SHORT).show()
context,
context?.getString(R.string.empty_instance),
Toast.LENGTH_SHORT
).show()
} }
} }