Cleaning, and fixing socket timeout log.

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/ACRAUtils.kt

@@ -0,0 +1,9 @@
+package bou.amine.apps.readerforselfossv2.android
+
+import org.acra.ACRA
+import org.acra.ktx.sendSilentlyWithAcra
+
+fun Throwable.sendSilentlyWithAcraWithName(name: String) {
+        ACRA.errorReporter.putCustomData("error_source", name)
+    this.sendSilentlyWithAcra()
+}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/HomeActivity.kt

@@ -59,9 +59,6 @@ import com.mikepenz.materialdrawer.util.updateBadge
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.acra.ACRA
-import org.acra.ktx.sendSilentlyWithAcra
-import org.acra.ktx.sendWithAcra
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
 import org.kodein.di.instance
@@ -325,7 +322,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     private fun handleGDPRDialog(GDPRShown: Boolean) {
         val messageDigest: MessageDigest = MessageDigest.getInstance("SHA-256")
         messageDigest.update(appSettingsService.getBaseUrl().toByteArray())
-        ACRA.errorReporter.putCustomData("unique_id", String(messageDigest.digest()))
         if (!GDPRShown) {
             val alertDialog = AlertDialog.Builder(this).create()
             alertDialog.setTitle(getString(R.string.gdpr_dialog_title))
@@ -513,7 +509,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
         val gdColor = try {
             Color.parseColor(it.color)
         } catch (e: IllegalArgumentException) {
-            e.sendSilentlyWithAcra()
+            e.sendSilentlyWithAcraWithName("color issue " + it.color)
             resources.getColor(R.color.colorPrimary)
         }
         gd.setColor(gdColor)

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/fragments/ArticleFragment.kt

@@ -25,6 +25,7 @@ import bou.amine.apps.readerforselfossv2.android.databinding.FragmentArticleBind
 import bou.amine.apps.readerforselfossv2.android.model.ParecelableItem
 import bou.amine.apps.readerforselfossv2.android.model.toModel
 import bou.amine.apps.readerforselfossv2.android.model.toParcelable
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
@@ -51,6 +52,7 @@ import org.kodein.di.DIAware
 import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 import java.net.MalformedURLException
+import java.net.SocketTimeoutException
 import java.net.URL
 import java.util.*
 import java.util.concurrent.ExecutionException
@@ -114,7 +116,7 @@ class ArticleFragment : Fragment(), DIAware {
                 typeface = try {
                     ResourcesCompat.getFont(requireContext(), resId)!!
                 } catch (e: java.lang.Exception) {
-                    e.sendSilentlyWithAcra()
+                    e.sendSilentlyWithAcraWithName("typeface")
                     // Just to be sure
                     null
                 }
@@ -220,7 +222,7 @@ class ArticleFragment : Fragment(), DIAware {
             )
 
         } catch (e: InflateException) {
-            e.sendSilentlyWithAcra()
+            e.sendSilentlyWithAcraWithName("webview not available")
             AlertDialog.Builder(requireContext())
                 .setMessage(requireContext().getString(R.string.webview_dialog_issue_message))
                 .setTitle(requireContext().getString(R.string.webview_dialog_issue_title))
@@ -254,74 +256,69 @@ class ArticleFragment : Fragment(), DIAware {
             binding.progressBar.visibility = View.VISIBLE
 
             CoroutineScope(Dispatchers.Main).launch {
-                 val response = mercuryApi.query(url)
+                try {
-                if (response.success) {
+                    val response = mercuryApi.query(url)
-                    try {
+                    if (response.success && response.data != null && !response.data?.content.isNullOrEmpty()) {
-                        if (response.data != null && response.data!!.content != null && !response.data!!.content.isNullOrEmpty()) {
+                        binding.titleView.text = response.data!!.title.orEmpty()
+                        try {
+                            if (typeface != null) {
+                                binding.titleView.typeface = typeface
+                            }
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > typeface")
+                        }
+
+                        try {
+                            // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                            URL(response.data!!.url)
+                            url = response.data!!.url
+                        } catch (e: MalformedURLException) {
+                            // Mercury returned a relative url
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > malformedurlexception")
+                        }
+
+                        try {
+                            contentText = response.data!!.content.orEmpty()
+                            htmlToWebview()
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > contenttext or html")
+                        }
+
+                        if (!response.data?.lead_image_url.isNullOrEmpty() && context != null) {
                             try {
-                                binding.titleView.text = response.data!!.title
+                                binding.imageView.visibility = View.VISIBLE
-                                if (typeface != null) {
-                                    binding.titleView.typeface = typeface
-                                }
                                 try {
-                                    // Note: Mercury may return relative urls... If it does the url val will not be changed.
+                                    Glide
-                                    URL(response.data!!.url)
+                                        .with(requireContext())
-                                    url = response.data!!.url
+                                        .asBitmap()
-                                } catch (e: MalformedURLException) {
+                                        .load(
-                                    // Mercury returned a relative url
+                                            response.data!!.lead_image_url.orEmpty()
-                                    e.sendSilentlyWithAcra()
+                                        )
+                                        .apply(RequestOptions.fitCenterTransform())
+                                        .into(binding.imageView)
+                                } catch (e: Exception) {
+                                    e.sendSilentlyWithAcraWithName("getContentFromMercury > glide lead image")
                                 }
                             } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
+                                e.sendSilentlyWithAcraWithName("getContentFromMercury > outside glide lead image")
-                            }
-
-                            try {
-                                contentText = response.data!!.content.orEmpty()
-                                htmlToWebview()
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
-                            }
-
-                            try {
-                                if (response.data!!.lead_image_url != null && !response.data!!.lead_image_url.isNullOrEmpty() && context != null) {
-                                    binding.imageView.visibility = View.VISIBLE
-                                    try {
-                                        Glide
-                                            .with(requireContext())
-                                            .asBitmap()
-                                            .load(
-                                                response.data!!.lead_image_url.orEmpty()
-                                            )
-                                            .apply(RequestOptions.fitCenterTransform())
-                                            .into(binding.imageView)
-                                    } catch (e: Exception) {
-                                        e.sendSilentlyWithAcra()
-                                    }
-                                } else {
-                                    binding.imageView.visibility = View.GONE
-                                }
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
-                            }
-
-                            try {
-                                binding.nestedScrollView.scrollTo(0, 0)
-
-                                binding.progressBar.visibility = View.GONE
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
                             }
                         } else {
-                            try {
+                            binding.imageView.visibility = View.GONE
-                                openInBrowserAfterFailing()
-                            } catch (e: Exception) {
-                                e.sendSilentlyWithAcra()
-                            }
                         }
-                    } catch (e: Exception) {
+
-                        e.sendSilentlyWithAcra()
+                        try {
+                            binding.nestedScrollView.scrollTo(0, 0)
+                            binding.progressBar.visibility = View.GONE
+                        } catch (e: Exception) {
+                            e.sendSilentlyWithAcraWithName("getContentFromMercury > scrollview")
+                        }
+                    } else {
+                        openInBrowserAfterFailing()
                     }
-                } else {
+                } catch (e: SocketTimeoutException) {
+                    openInBrowserAfterFailing()
+                } catch (e: Exception) {
+                    e.sendSilentlyWithAcraWithName("getContentFromMercury > whole thing")
                     openInBrowserAfterFailing()
                 }
             }
@@ -364,7 +361,7 @@ class ArticleFragment : Fragment(), DIAware {
                         val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                         return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.JPEG))
                     } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcra()
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > jpeg")
                     }
                 }
                 else if (url.lowercase(Locale.US).contains(".png")) {
@@ -372,7 +369,7 @@ class ArticleFragment : Fragment(), DIAware {
                         val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                         return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.PNG))
                     } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcra()
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > png")
                     }
                 }
                 else if (url.lowercase(Locale.US).contains(".webp")) {
@@ -380,7 +377,7 @@ class ArticleFragment : Fragment(), DIAware {
                         val image = Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
                         return WebResourceResponse("image/jpg", "UTF-8", getBitmapInputStream(image, Bitmap.CompressFormat.WEBP))
                     } catch ( e : ExecutionException) {
-                        e.sendSilentlyWithAcra()
+                        e.sendSilentlyWithAcraWithName("shouldInterceptRequest > webp")
                     }
                 }
 
@@ -405,7 +402,7 @@ class ArticleFragment : Fragment(), DIAware {
             val itemUrl = URL(url)
             baseUrl = itemUrl.protocol + "://" + itemUrl.host
         } catch (e: MalformedURLException) {
-            e.sendSilentlyWithAcra()
+            e.sendSilentlyWithAcraWithName("htmlToWebview > item url")
         }
 
         val fontName =  when (font) {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/AndroidIModelUtils.kt

@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android.model
 
 import android.content.Context
 import android.webkit.URLUtil
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.getImages
 import com.bumptech.glide.Glide
@@ -24,7 +25,7 @@ fun SelfossModel.Item.preloadImages(context: Context) : Boolean {
             }
         }
     } catch (e : Error) {
-        e.sendSilentlyWithAcra()
+        e.sendSilentlyWithAcraWithName("preloadImages")
         return false
     }
 
@@ -37,7 +38,7 @@ fun String.toTextDrawableString(): String {
         try {
             textDrawable.append(s[0])
         } catch (e: StringIndexOutOfBoundsException) {
-            e.sendSilentlyWithAcra()
+            e.sendSilentlyWithAcraWithName("toTextDrawableString")
         }
     }
     return textDrawable.toString()

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt

@@ -16,6 +16,7 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ActivitySettingsBinding
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import org.acra.ktx.sendSilentlyWithAcra
 import org.acra.ktx.sendWithAcra
@@ -124,7 +125,7 @@ class SettingsActivity : AppCompatActivity(),
                                 val input: Int = (dest.toString() + source.toString()).toInt()
                                 if (input in 1..200) return@InputFilter null
                             } catch (nfe: NumberFormatException) {
-                                nfe.sendSilentlyWithAcra()
+                                nfe.sendSilentlyWithAcraWithName("GeneralPreferenceFragment")
                                 Toast.makeText(activity, R.string.items_number_should_be_number, Toast.LENGTH_LONG).show()
                             }
                             ""
@@ -148,7 +149,7 @@ class SettingsActivity : AppCompatActivity(),
                         try {
                             editText.textSize = editable.toString().toInt().toFloat()
                         } catch (e: NumberFormatException) {
-                            e.sendSilentlyWithAcra()
+                            e.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > afterTextChanged")
                         }
                     }
                 } }
@@ -158,7 +159,7 @@ class SettingsActivity : AppCompatActivity(),
                                 val input = (dest.toString() + source.toString()).toInt()
                                 if (input > 0) return@InputFilter null
                             } catch (nfe: NumberFormatException) {
-                                nfe.sendSilentlyWithAcra()
+                                nfe.sendSilentlyWithAcraWithName("ArticleViewerPreferenceFragment > filters")
                             }
                             ""
                         }