Compare commits
2 Commits
fix-toast
...
4a093fd969
Author | SHA1 | Date | |
---|---|---|---|
4a093fd969 | |||
03ea12000c |
@ -60,9 +60,23 @@ class LoginActivityTest {
|
|||||||
fun urlError() {
|
fun urlError() {
|
||||||
performLogin("10.0.2.2:8888")
|
performLogin("10.0.2.2:8888")
|
||||||
onView(withId(R.id.urlView)).perform(click())
|
onView(withId(R.id.urlView)).perform(click())
|
||||||
|
onView(withId(R.id.urlView)).check(matches(withError(R.string.login_url_problem)))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun connectError() {
|
||||||
|
performLogin("http://10.0.2.2:8889")
|
||||||
|
onView(withId(R.id.urlView)).perform(click())
|
||||||
onView(withId(R.id.urlView)).check(matches(withError(R.string.wrong_infos)))
|
onView(withId(R.id.urlView)).check(matches(withError(R.string.wrong_infos)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun urlSlashError() {
|
||||||
|
performLogin("https://google.fr/toto")
|
||||||
|
onView(withId(R.id.urlView)).perform(click())
|
||||||
|
onView(withId(R.id.urlView)).check(matches(withError(R.string.login_url_problem)))
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun multiError() {
|
fun multiError() {
|
||||||
onView(withId(R.id.signInButton)).perform(click())
|
onView(withId(R.id.signInButton)).perform(click())
|
||||||
|
@ -149,9 +149,10 @@ class LoginActivity :
|
|||||||
.toString()
|
.toString()
|
||||||
.trim()
|
.trim()
|
||||||
|
|
||||||
failInvalidUrl(url)
|
val cancelUrl = failInvalidUrl(url)
|
||||||
failLoginDetails(password, login)
|
if (cancelUrl) return
|
||||||
|
val cancelDetails = failLoginDetails(password, login)
|
||||||
|
if (cancelDetails) return
|
||||||
showProgress(true)
|
showProgress(true)
|
||||||
|
|
||||||
appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
|
appSettingsService.updateSelfSigned(binding.selfSigned.isChecked)
|
||||||
@ -193,7 +194,7 @@ class LoginActivity :
|
|||||||
private fun failLoginDetails(
|
private fun failLoginDetails(
|
||||||
password: String,
|
password: String,
|
||||||
login: String,
|
login: String,
|
||||||
) {
|
): Boolean {
|
||||||
var lastFocusedView: View? = null
|
var lastFocusedView: View? = null
|
||||||
var cancel = false
|
var cancel = false
|
||||||
if (isWithLogin) {
|
if (isWithLogin) {
|
||||||
@ -210,9 +211,10 @@ class LoginActivity :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
maybeCancelAndFocusView(cancel, lastFocusedView)
|
maybeCancelAndFocusView(cancel, lastFocusedView)
|
||||||
|
return cancel
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun failInvalidUrl(url: String) {
|
private fun failInvalidUrl(url: String): Boolean {
|
||||||
val focusView = binding.urlView
|
val focusView = binding.urlView
|
||||||
var cancel = false
|
var cancel = false
|
||||||
if (url.isBaseUrlInvalid()) {
|
if (url.isBaseUrlInvalid()) {
|
||||||
@ -232,6 +234,7 @@ class LoginActivity :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
maybeCancelAndFocusView(cancel, focusView)
|
maybeCancelAndFocusView(cancel, focusView)
|
||||||
|
return cancel
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun maybeCancelAndFocusView(
|
private fun maybeCancelAndFocusView(
|
||||||
|
@ -9,7 +9,6 @@ import android.widget.TextView
|
|||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
|
import bou.amine.apps.readerforselfossv2.android.databinding.ActivityUpsertSourceBinding
|
||||||
import bou.amine.apps.readerforselfossv2.android.utils.isBaseUrlInvalid
|
|
||||||
import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
|
import bou.amine.apps.readerforselfossv2.model.NetworkUnavailableException
|
||||||
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
import bou.amine.apps.readerforselfossv2.model.SelfossModel
|
||||||
import bou.amine.apps.readerforselfossv2.repository.Repository
|
import bou.amine.apps.readerforselfossv2.repository.Repository
|
||||||
@ -76,13 +75,7 @@ class UpsertSourceActivity :
|
|||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
|
handleSpoutsSpinner()
|
||||||
val baseUrl = appSettingsService.getBaseUrl()
|
|
||||||
if (baseUrl.isEmpty() || baseUrl.isBaseUrlInvalid()) {
|
|
||||||
mustLoginToAddSource()
|
|
||||||
} else {
|
|
||||||
handleSpoutsSpinner()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("detekt:SwallowedException")
|
@Suppress("detekt:SwallowedException")
|
||||||
|
Reference in New Issue
Block a user