Changing acra errors handling.

app/build.gradle

@@ -2,7 +2,7 @@ buildscript {
 }
 
 def gitVersion() {
-    def process = "git for-each-ref refs/tags --sort=-taggerdate --format='%(refname:short)' --count=1".execute()
+    def process = "git for-each-ref refs/tags --sort=-authordate --format='%(refname:short)' --count=1".execute()
     return process.text.replaceAll("'", "").substring(1).replaceAll("\\.", "").trim()
 }
 
@@ -170,4 +170,4 @@ def initAppLoginPropertiesIfNeeded() {
             entry(key: "appLoginPassword", value: System.getProperty("appLoginPassword"))
         }
     }
-}
+}

app/src/main/java/apps/amine/bou/readerforselfoss/AddSourceActivity.kt

@@ -109,7 +109,7 @@ class AddSourceActivity : AppCompatActivity() {
         super.onResume()
         val config = Config(this)
 
-        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(false)) {
+        if (config.baseUrl.isEmpty() || !config.baseUrl.isBaseUrlValid(false, this@AddSourceActivity)) {
             mustLoginToAddSource()
         } else {
             handleSpoutsSpinner(spoutsSpinner, api, progress, formContainer)

app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt

@@ -54,7 +54,6 @@ class LoginActivity : AppCompatActivity() {
 
         handleBaseUrlFail()
 
-
         settings = getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE)
         userIdentifier = settings.getString("unique_id", "")
         logErrors = settings.getBoolean("login_debug", false)
@@ -145,7 +144,7 @@ class LoginActivity : AppCompatActivity() {
         var cancel = false
         var focusView: View? = null
 
-        if (!url.isBaseUrlValid(logErrors)) {
+        if (!url.isBaseUrlValid(logErrors, this@LoginActivity)) {
             urlView.error = getString(R.string.login_url_problem)
             focusView = urlView
             cancel = true

app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt

@@ -28,10 +28,8 @@ import java.io.IOException
 import java.util.UUID.randomUUID
 
 
-@AcraHttpSender(uri = "http://amine-bou.fr:5984/acra-selfoss/_design/acra-storage/_update/report",
+@AcraHttpSender(uri = "http://37.187.110.167/amine/acra/simplest-acra.php",
-                basicAuthLogin = "selfoss",
+                httpMethod = HttpSender.Method.POST)
-                basicAuthPassword = "selfoss",
-                httpMethod = HttpSender.Method.PUT)
 @AcraDialog(resText = R.string.crash_dialog_text,
             resCommentPrompt = R.string.crash_dialog_comment,
             resTheme = android.R.style.Theme_DeviceDefault_Dialog)

app/src/main/java/apps/amine/bou/readerforselfoss/utils/Acra.kt

@@ -2,15 +2,21 @@ package apps.amine.bou.readerforselfoss.utils
 
 import android.content.Context
 import android.preference.PreferenceManager
+import android.provider.Settings
 import org.acra.ErrorReporter
 
 fun ErrorReporter.maybeHandleSilentException(throwable: Throwable, ctx: Context) {
     val sharedPref = PreferenceManager.getDefaultSharedPreferences(ctx)
-    if (sharedPref.getBoolean("acra_should_log", false)) {
+    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
+
+    if (sharedPref.getBoolean("acra_should_log", false) && !isTestLab) {
         this.handleSilentException(throwable)
     }
 }
 
-fun ErrorReporter.doHandleSilentException(throwable: Throwable) {
+fun ErrorReporter.doHandleSilentException(throwable: Throwable, ctx: Context) {
-    this.handleSilentException(throwable)
+    val isTestLab = Settings.System.getString(ctx.contentResolver, "firebase.test.lab") ==  "true"
+    if (!isTestLab) {
+        this.handleSilentException(throwable)
+    }
 }

app/src/main/java/apps/amine/bou/readerforselfoss/utils/LinksUtils.kt

@@ -135,7 +135,7 @@ private fun openInBrowser(linkDecoded: String, app: Activity) {
 fun String.isUrlValid(): Boolean =
     HttpUrl.parse(this) != null && Patterns.WEB_URL.matcher(this).matches()
 
-fun String.isBaseUrlValid(logErrors: Boolean): Boolean {
+fun String.isBaseUrlValid(logErrors: Boolean, ctx: Context): Boolean {
     val baseUrl = HttpUrl.parse(this)
     var existsAndEndsWithSlash = false
     if (baseUrl != null) {
@@ -145,7 +145,7 @@ fun String.isBaseUrlValid(logErrors: Boolean): Boolean {
 
     val isValid = Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash
     if (!isValid && logErrors) {
-        ACRA.getErrorReporter().doHandleSilentException(java.lang.Exception("Patterns.WEB_URL.matcher(this).matches() == ${Patterns.WEB_URL.matcher(this).matches()} && existsAndEndsWithSlash == $existsAndEndsWithSlash && baseUrl.pathSegments() == ${baseUrl?.pathSegments()}"))
+        ACRA.getErrorReporter().doHandleSilentException(java.lang.Exception("Patterns.WEB_URL.matcher(this).matches() == ${Patterns.WEB_URL.matcher(this).matches()} && existsAndEndsWithSlash == $existsAndEndsWithSlash && baseUrl.pathSegments() == ${baseUrl?.pathSegments()}"), ctx)
     }
     return isValid
 }