androidApp/build.gradle.kts

@@ -203,7 +203,7 @@ dependencies {
 
     implementation("ch.acra:acra-http:$acraVersion")
     implementation("ch.acra:acra-toast:$acraVersion")
-    implementation("com.google.auto.service:auto-service:1.1.1")
+
 }
 
 tasks.withType<Test> {

androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/LoginActivityTest.kt

@@ -62,7 +62,7 @@ class LoginActivityTest {
 
     @Test
     fun urlError() {
-        performLogin("10.0.2.2:8888")
+        performLogin("172.17.0.1:8888")
         onView(withId(R.id.urlView)).perform(click())
         onView(withId(R.id.urlView)).check(matches(withError(R.string.wrong_infos)))
     }

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

@@ -1,4 +1,4 @@
-package bou.amine.apps.readerforselfossv2.android.utils.acra
+package bou.amine.apps.readerforselfossv2.android
 
 import org.acra.ACRA
 import org.acra.ktx.sendSilentlyWithAcra
@@ -6,4 +6,4 @@ 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

@@ -1,6 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android
 
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -31,7 +32,6 @@ import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.maybeShow
 import bou.amine.apps.readerforselfossv2.android.utils.bottombar.removeBadge
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
@@ -589,7 +589,9 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener, DIAwar
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.issue_tracker -> {
-                baseContext.openUrlInBrowser(AppSettingsService.trackerUrl)
+                val browserIntent =
+                    Intent(Intent.ACTION_VIEW, Uri.parse(AppSettingsService.trackerUrl))
+                startActivity(browserIntent)
                 return true
             }
 

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

@@ -8,11 +8,11 @@ import android.widget.ImageView.ScaleType
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.CardItemBinding
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.bitmapCenterCrop
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -71,7 +71,7 @@ class ItemCardAdapter(
         }
 
         binding.browserBtn.setOnClickListener {
-            c.openItemUrlInBrowserAsNewTask(items[position])
+            c.openInBrowserAsNewTask(items[position])
         }
     }
 
@@ -126,4 +126,4 @@ class ItemCardAdapter(
     }
 
     inner class ViewHolder(val binding: CardItemBinding) : RecyclerView.ViewHolder(binding.root)
-}
+}

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

@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.ListItemBinding
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.LinkOnTouchListener
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.repository.Repository
@@ -73,4 +73,4 @@ class ItemListAdapter(
     }
 
     inner class ViewHolder(val binding: ListItemBinding) : RecyclerView.ViewHolder(binding.root)
-}
+}

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

@@ -1,20 +1,16 @@
 package bou.amine.apps.readerforselfossv2.android.fragments
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.res.ColorStateList
 import android.content.res.TypedArray
 import android.graphics.Bitmap
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
+import android.net.Uri
 import android.os.Bundle
 import android.util.TypedValue
-import android.view.GestureDetector
+import android.view.*
-import android.view.InflateException
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
 import android.webkit.WebResourceResponse
 import android.webkit.WebSettings
 import android.webkit.WebView
@@ -29,11 +25,10 @@ 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.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.android.utils.glide.getBitmapInputStream
 import bou.amine.apps.readerforselfossv2.android.utils.isUrlValid
-import bou.amine.apps.readerforselfossv2.android.utils.openItemUrlInBrowserAsNewTask
+import bou.amine.apps.readerforselfossv2.android.utils.openInBrowserAsNewTask
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
 import bou.amine.apps.readerforselfossv2.android.utils.shareLink
 import bou.amine.apps.readerforselfossv2.model.MercuryModel
 import bou.amine.apps.readerforselfossv2.model.SelfossModel
@@ -58,7 +53,7 @@ import org.kodein.di.android.x.closestDI
 import org.kodein.di.instance
 import java.net.MalformedURLException
 import java.net.URL
-import java.util.Locale
+import java.util.*
 import java.util.concurrent.ExecutionException
 
 private const val IMAGE_JPG = "image/jpg"
@@ -216,7 +211,7 @@ class ArticleFragment : Fragment(), DIAware {
                 override fun onItemClick(item: MenuItem) {
                     when (item.itemId) {
                         R.id.share_action -> requireActivity().shareLink(url, contentTitle)
-                        R.id.open_action -> requireActivity().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+                        R.id.open_action -> requireActivity().openInBrowserAsNewTask(this@ArticleFragment.item)
                         R.id.unread_action ->
                             if (context != null) {
                                 if (this@ArticleFragment.item.unread) {
@@ -241,7 +236,6 @@ class ArticleFragment : Fragment(), DIAware {
                                     ).show()
                                 }
                             }
-
                         else -> Unit
                     }
                 }
@@ -294,7 +288,7 @@ class ArticleFragment : Fragment(), DIAware {
             contentText = data.content.orEmpty()
             htmlToWebview()
 
-            handleLeadImage(data.lead_image_url)
+            handleLeadImage(data?.lead_image_url)
 
             binding.nestedScrollView.scrollTo(0, 0)
             binding.progressBar.visibility = View.GONE
@@ -326,7 +320,11 @@ class ArticleFragment : Fragment(), DIAware {
                     url: String,
                 ): Boolean {
                     return if (context != null && url.isUrlValid() && binding.webcontent.hitTestResult.type != WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
-                        requireContext().openUrlInBrowser(url)
+                        try {
+                            requireContext().startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))
+                        } catch (e: ActivityNotFoundException) {
+                            e.sendSilentlyWithAcraWithName("activityNotFound > $url")
+                        }
                         true
                     } else {
                         false
@@ -345,8 +343,7 @@ class ArticleFragment : Fragment(), DIAware {
                     ) {
                         try {
                             val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit()
+                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                                    .get()
                             return WebResourceResponse(
                                 IMAGE_JPG,
                                 "UTF-8",
@@ -358,8 +355,7 @@ class ArticleFragment : Fragment(), DIAware {
                     } else if (url.lowercase(Locale.US).contains(".png")) {
                         try {
                             val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit()
+                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                                    .get()
                             return WebResourceResponse(
                                 IMAGE_JPG,
                                 "UTF-8",
@@ -371,8 +367,7 @@ class ArticleFragment : Fragment(), DIAware {
                     } else if (url.lowercase(Locale.US).contains(".webp")) {
                         try {
                             val image =
-                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit()
+                                Glide.with(view).asBitmap().apply(glideOptions).load(url).submit().get()
-                                    .get()
                             return WebResourceResponse(
                                 IMAGE_JPG,
                                 "UTF-8",
@@ -550,7 +545,7 @@ class ArticleFragment : Fragment(), DIAware {
     private fun openInBrowserAfterFailing() {
         binding.progressBar.visibility = View.GONE
         if (context != null) {
-            requireContext().openItemUrlInBrowserAsNewTask(this@ArticleFragment.item)
+            requireContext().openInBrowserAsNewTask(this@ArticleFragment.item)
         } else {
             Exception("openInBrowserAfterFailing context is null").sendSilentlyWithAcraWithName("openInBrowserAfterFailing > $context")
         }
@@ -570,9 +565,9 @@ class ArticleFragment : Fragment(), DIAware {
 
     fun performClick(): Boolean {
         if (allImages != null && (
-                    binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
+                binding.webcontent.hitTestResult.type == WebView.HitTestResult.IMAGE_TYPE ||
-                            binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
+                    binding.webcontent.hitTestResult.type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE
-                    )
+            )
         ) {
             val position: Int = allImages.indexOf(binding.webcontent.hitTestResult.extra)
 
@@ -584,4 +579,4 @@ class ArticleFragment : Fragment(), DIAware {
         }
         return false
     }
-}
+}

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

@@ -15,7 +15,7 @@ import android.view.ViewGroup
 import bou.amine.apps.readerforselfossv2.android.HomeActivity
 import bou.amine.apps.readerforselfossv2.android.R
 import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.utils.getColorHexCode
 import bou.amine.apps.readerforselfossv2.utils.getHtmlDecoded
@@ -192,4 +192,4 @@ class FilterSheetFragment : BottomSheetDialogFragment(), DIAware {
     companion object {
         const val TAG = "FilterModalBottomSheet"
     }
-}
+}

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

@@ -2,7 +2,7 @@ package bou.amine.apps.readerforselfossv2.android.model
 
 import android.content.Context
 import android.webkit.URLUtil
-import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
+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
@@ -40,4 +40,4 @@ fun String.toTextDrawableString(): String {
         }
     }
     return textDrawable.toString()
-}
+}

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

@@ -1,5 +1,7 @@
 package bou.amine.apps.readerforselfossv2.android.settings
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.text.Editable
 import android.text.InputFilter
@@ -14,8 +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.utils.acra.sendSilentlyWithAcraWithName
+import bou.amine.apps.readerforselfossv2.android.sendSilentlyWithAcraWithName
-import bou.amine.apps.readerforselfossv2.android.utils.openUrlInBrowser
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
 import com.mikepenz.aboutlibraries.LibsBuilder
 import org.kodein.di.DIAware
@@ -236,8 +237,9 @@ class SettingsActivity :
     }
 
     class LinksPreferenceFragment : PreferenceFragmentCompat() {
-        private fun openUrl(url: String) {
+        private fun openUrl(uri: Uri?) {
-            context?.openUrlInBrowser(url)
+            val browserIntent = Intent(Intent.ACTION_VIEW, uri)
+            startActivity(browserIntent)
         }
 
         override fun onCreatePreferences(
@@ -248,19 +250,19 @@ class SettingsActivity :
 
             preferenceManager.findPreference<Preference>("trackerLink")?.onPreferenceClickListener =
                 Preference.OnPreferenceClickListener {
-                    openUrl(AppSettingsService.trackerUrl)
+                    openUrl(Uri.parse(AppSettingsService.trackerUrl))
                     true
                 }
 
             preferenceManager.findPreference<Preference>("sourceLink")?.onPreferenceClickListener =
                 Preference.OnPreferenceClickListener {
-                    openUrl(AppSettingsService.sourceUrl)
+                    openUrl(Uri.parse(AppSettingsService.sourceUrl))
                     false
                 }
 
             preferenceManager.findPreference<Preference>("translation")?.onPreferenceClickListener =
                 Preference.OnPreferenceClickListener {
-                    openUrl(AppSettingsService.translationUrl)
+                    openUrl(Uri.parse(AppSettingsService.translationUrl))
                     false
                 }
         }

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

@@ -1,7 +1,6 @@
 package bou.amine.apps.readerforselfossv2.android.utils
 
 import android.app.Activity
-import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -18,7 +17,6 @@ import bou.amine.apps.readerforselfossv2.model.SelfossModel
 import bou.amine.apps.readerforselfossv2.utils.toStringUriWithHttp
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
-
 fun Context.openItemUrl(
     currentItem: Int,
     linkDecoded: String,
@@ -37,13 +35,15 @@ fun Context.openItemUrl(
             intent.putExtra("currentItem", currentItem)
             app.startActivity(intent)
         } else {
-            this.openUrlInBrowserAsNewTask(linkDecoded)
+            val intent = Intent(Intent.ACTION_VIEW)
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            intent.data = Uri.parse(linkDecoded.toStringUriWithHttp())
+            startActivity(intent)
         }
     }
 }
 
-fun String.isUrlValid(): Boolean =
+fun String.isUrlValid(): Boolean = this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
-    this.toHttpUrlOrNull() != null && Patterns.WEB_URL.matcher(this).matches()
 
 fun String.isBaseUrlInvalid(): Boolean {
     val baseUrl = this.toHttpUrlOrNull()
@@ -56,31 +56,11 @@ fun String.isBaseUrlInvalid(): Boolean {
     return !(Patterns.WEB_URL.matcher(this).matches() && existsAndEndsWithSlash)
 }
 
-fun Context.openItemUrlInBrowserAsNewTask(i: SelfossModel.Item) {
+fun Context.openInBrowserAsNewTask(i: SelfossModel.Item) {
-    this.openUrlInBrowserAsNewTask(i.getLinkDecoded().toStringUriWithHttp())
-}
-
-fun Context.openUrlInBrowserAsNewTask(url: String) {
-
     val intent = Intent(Intent.ACTION_VIEW)
     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-    intent.data = Uri.parse(url)
+    intent.data = Uri.parse(i.getLinkDecoded().toStringUriWithHttp())
-    this.mayBeStartActivity(intent)
+    startActivity(intent)
-}
-
-fun Context.openUrlInBrowser(url: String) {
-    val intent = Intent(Intent.ACTION_VIEW)
-    intent.data = Uri.parse(url)
-    this.mayBeStartActivity(intent)
-}
-
-fun Context.mayBeStartActivity(intent: Intent) {
-    try {
-        this.startActivity(intent)
-    } catch (e: ActivityNotFoundException) {
-        Toast.makeText(this, getString(R.string.no_browser), Toast.LENGTH_SHORT).show()
-    }
-
 }
 
 class LinkOnTouchListener : View.OnTouchListener {
@@ -122,4 +102,4 @@ class LinkOnTouchListener : View.OnTouchListener {
         }
         return ret
     }
-}
+}

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/acra/AcraReportingAdministrator.kt

@@ -1,29 +0,0 @@
-package bou.amine.apps.readerforselfossv2.android.utils.acra
-
-import android.content.Context
-import android.os.DeadSystemException
-import com.google.auto.service.AutoService
-import org.acra.builder.ReportBuilder
-import org.acra.config.CoreConfiguration
-import org.acra.config.ReportingAdministrator
-import org.acra.data.CrashReportData
-
-
-@AutoService(ReportingAdministrator::class)
-class AcraReportingAdministrator : ReportingAdministrator {
-    override fun shouldStartCollecting(
-        context: Context,
-        config: CoreConfiguration,
-        reportBuilder: ReportBuilder
-    ): Boolean {
-        return reportBuilder.exception !is DeadSystemException
-    }
-
-    override fun shouldSendReport(
-        context: Context,
-        config: CoreConfiguration,
-        crashReportData: CrashReportData
-    ): Boolean {
-        return crashReportData.get("BRAND") != "redroid"
-    }
-}

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/rest/RestUtils.kt

@@ -30,14 +30,10 @@ suspend fun maybeResponse(r: HttpResponse?): SuccessResponse {
 }
 
 suspend inline fun <reified T> bodyOrFailure(r: HttpResponse?): StatusAndData<T> {
-    try {
+    return if (r != null && r.status.isSuccess()) {
-        return if (r != null && r.status.isSuccess()) {
+        StatusAndData.succes(r.body())
-            StatusAndData.succes(r.body())
+    } else {
-        } else {
+        StatusAndData.error()
-            StatusAndData.error()
-        }
-    } catch (e: Throwable) {
-        return StatusAndData.error()
     }
 }
 
@@ -98,4 +94,4 @@ suspend fun HttpClient.tryToSubmitForm(
             url(url)
             block()
         }
-    }
+    }

shared/src/iosArm64Main/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt

@@ -2,8 +2,12 @@ package bou.amine.apps.readerforselfossv2.utils
 
 actual class DateUtils {
     actual companion object {
+        actual fun parseDate(dateString: String): Long {
+            TODO("Not yet implemented")
+        }
+
         actual fun parseRelativeDate(dateString: String): String {
             TODO("Not yet implemented")
         }
     }
-}
+}

shared/src/iosX64Main/kotlin/bou/amine/apps/readerforselfossv2/utils/DateUtils.kt

@@ -2,8 +2,12 @@ package bou.amine.apps.readerforselfossv2.utils
 
 actual class DateUtils {
     actual companion object {
+        actual fun parseDate(dateString: String): Long {
+            TODO("Not yet implemented")
+        }
+
         actual fun parseRelativeDate(dateString: String): String {
             TODO("Not yet implemented")
         }
     }
-}
+}