Anri/mobilismScrap
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Wiki Activity

Better error handling for the user interface

Browse source
This commit is contained in:
Mylloon 2021-08-31 13:57:27 +02:00
parent 105a91371e
commit 15367bf285
4 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/mylloon/mobidl/MainActivity.kt
View file

@ -26,6 +26,10 @@ import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import kotlinx.coroutines.runBlocking
import java.util.*
import android.widget.Toast
class MainActivity : AppCompatActivity() {
@ -158,6 +162,12 @@ class MainActivity : AppCompatActivity() {
button?.text.toString()
)
}
val checkedItems = booleanArrayOf(
false // get this info from the app files somewhere
)
builder.setMultiChoiceItems(arrayOf(getString(R.string.updateCheck)), checkedItems) { _, _, isChecked ->
println("Update for ${button?.text.toString()}: " + if (isChecked) "enabled" else "disabled" + "")
}
builder.setNeutralButton(R.string.cancel) { dialog, _ -> dialog.cancel() }
builder.show()
true
@ -240,7 +250,7 @@ class MainActivity : AppCompatActivity() {
if (returns[0] == "loginAttemptsExceeded") {
if (returns[1] == "null") callScrapper(user, password, app)
val registeredAnswered: Map<String, String> = Gson().fromJson(
applicationContext.assets.open("captcha.json").bufferedReader()
assets.open("captcha.json").bufferedReader()
.use { it.readText() },
object : TypeToken<Map<String, String>>() {}.type
)
@ -258,9 +268,15 @@ class MainActivity : AppCompatActivity() {
builder.setNeutralButton(R.string.cancel) { dialog, _ -> dialog.cancel() }
builder.show()
Toast.makeText(applicationContext(), "${getString(R.string.connectionFailed)}\n${getString(R.string.credentialsDeleted)}.",
Toast.makeText(instance, "${getString(R.string.connectionFailed)}\n${getString(R.string.credentialsDeleted)}.",
Toast.LENGTH_LONG).show()
}
if (returns[0] == "noSID")
Toast.makeText(instance, R.string.noSID, Toast.LENGTH_SHORT).show()
if (returns[0] == "badSID")
Toast.makeText(instance, "${getString(R.string.badSID)}...", Toast.LENGTH_SHORT).show()
if (returns[0] == "noResults")
Toast.makeText(instance, "${getString(R.string.badSID)}...", Toast.LENGTH_SHORT).show()
}
}
}

36
app/src/main/java/com/mylloon/mobidl/Scraper.kt
View file

@ -5,10 +5,11 @@ import com.github.kittinunf.fuel.core.FuelManager
import com.github.kittinunf.fuel.httpGet
import com.github.kittinunf.fuel.httpPost
import com.mylloon.mobidl.MainActivity.Companion.applicationContext
import java.lang.System.currentTimeMillis
import com.github.kittinunf.result.Result.Failure as FuelFailure
import com.github.kittinunf.result.Result.Success as FuelSuccess
var timeOfLastToast: Long = currentTimeMillis() - 2000
class Scraper(
private var pseudo: String,
private var password: String,
@ -26,14 +27,14 @@ class Scraper(
private var loginAttemptsExceeded = "You exceeded the maximum allowed number of login attempts."
private var searchNotLogged = "Sorry but you are not permitted to use the search system. If you're not logged in please"
private fun errorFormat(
private fun errorFormat( // Pretty error message.
code: Int? = null,
message: String = ""
): String { // Pretty error message.
): String {
return "${if (code != null) "[$code]" else ""}${if ((message.isNotEmpty()) and (code is Int)) " " else ""}$message."
}
private fun connect(): MutableList<String>? {
private fun connect(): MutableList<String>? { // Login to the forum using credentials.
if (debug) println("Connection attempt...")
retry++
FuelManager.instance.basePath = url
@ -63,35 +64,39 @@ class Scraper(
return search()
}
private fun error(htmlPage: String): MutableList<String>? {
private fun error(htmlPage: String): MutableList<String>? { // Handle connection errors
var message = ""
var array: MutableList<String>? = null
var lengthTime = Toast.LENGTH_LONG
if (errorNotConnected in htmlPage) {
if (loginAttemptsExceeded in htmlPage) {
message = "${applicationContext().getString(R.string.knownCaptcha)}..."
lengthTime = Toast.LENGTH_LONG
lengthTime = Toast.LENGTH_SHORT
val qaConfirmID = "(?<=qa_confirm_id\" value=\")(.{32})".toRegex().find(htmlPage)?.value
var answer = "(?<=answer\">)(.*)</l".toRegex().find(htmlPage)?.value
answer = answer?.dropLast(3)
array = mutableListOf("loginAttemptsExceeded", answer.toString(), qaConfirmID.toString())
var question = "(?<=answer\">)(.*)</l".toRegex().find(htmlPage)?.value
question = question?.dropLast(3)
array = if (question == null) null else mutableListOf("loginAttemptsExceeded", question.toString(), qaConfirmID.toString())
} else {
message = "${applicationContext().getString(R.string.connectionFailed)}\n${applicationContext().getString(R.string.credentialsDeleted)}."
Credentials().delete()
array = mutableListOf("errorNotConnected")
}
}
val now = currentTimeMillis()
fun sendToast() {
Toast.makeText(applicationContext(), message, lengthTime)
.show()
timeOfLastToast = now
}
println(errorFormat(message = message))
Toast.makeText(applicationContext(), message, lengthTime)
.show()
if ((now - timeOfLastToast) >= 2000) sendToast()
return array
}
fun search(): MutableList<String>? { // Do the research.
if (sid == null) {
println(errorFormat(message = "SID not found"))
return if (retry < 3) connect() else null
return if (retry < 3) connect() else mutableListOf("noSID")
} else {
if (debug) println("SID recovered")
retry = 0
@ -115,15 +120,16 @@ class Scraper(
val data = session.join().data.decodeToString()
return if (searchNotLogged in data) {
println(errorFormat(message = "The SID doesn't work, new attempt..."))
if (retry < 3) connect() else null
if (retry < 3) connect() else mutableListOf("badSID")
} else parse(data)
}
private fun parse(htmlPage: String): MutableList<String>? {
private fun parse(htmlPage: String): MutableList<String>? { // Parse HTML response to a clean list.
if (debug) println("Fetching results for $app...")
Toast.makeText(applicationContext(), "Fetching results for $app...", Toast.LENGTH_SHORT)
.show()
// println(htmlPage)
if ("No suitable matches were found." in htmlPage) return mutableListOf("noResults")
return null
}

3
app/src/main/res/values-fr-rFR/strings.xml
View file

@ -23,4 +23,7 @@
<string name="loginAttemptsExceeded">Vous avez dépassé le nombre maximum de tentatives de connexion, veuillez compléter les captchas</string>
<string name="notConnected">Vous n\'êtes pas connecté, redirection vers la page de connexion</string>
<string name="knownCaptcha">Résolution des captchas</string>
<string name="noSID">Aucun SID n\'a été trouvé</string>
<string name="badSID">Le SID ne fonctionne pas, nouvel essaie</string>
<string name="updateCheck">Vérification des mises à jour</string>
</resources>

3
app/src/main/res/values/strings.xml
View file

@ -14,6 +14,7 @@
<string name="validate">Validate</string>
<string name="remove">Remove</string>
<string name="cancel">Cancel</string>
<string name="updateCheck">Update check</string>
<string name="notConnected">You are not logged in, redirection to the login page</string>
<string name="dropBro">drop bro</string>
@ -30,4 +31,6 @@
<string name="credentialsDeleted">Your credentials have been deleted</string>
<string name="loginAttemptsExceeded">You have exceeded the maximum number of connection attempts, please complete captchas</string>
<string name="knownCaptcha">Resolving captchas</string>
<string name="noSID">No SID was found</string>
<string name="badSID">The SID does not work, new attempt</string>
</resources>