fix: review fixes

Author: Anty0

core/src/androidMain/kotlin/io/tolgee/TolgeeAndroid.kt

@@ -139,6 +139,26 @@ data class TolgeeAndroid internal constructor(
         }?.ifEmpty { null } ?: resources.getStringArray(id).toList()
     }
 
+    /**
+     * Provides an immediate translation for the given string resource ID within the given context.
+     * If a translation key is derived from the string resource, it retrieves the translation using Tolgee.
+     * Otherwise, it falls back to returning the default string resource value.
+     *
+     * This is a special version that allows returning a [CharSequence] instead of a [String] and
+     * will fall back to the Android `getText` method if no translation is found - preserving formatting.
+     *
+     * If translation is found, no style information is preserved and the method acts the same as [t].
+     *
+     * @param context The context used to access resources and provide localization settings.
+     * @param id The resource ID of the string to be translated.
+     * @return The translated string if a key-based translation is found; otherwise, the default string resource value.
+     */
+    fun tStyled(context: Context, @StringRes id: Int): CharSequence {
+        return getKeyFromResources(context, id)?.let { key ->
+            t(key)
+        } ?: context.getText(id)
+    }
+
     /**
      * Preloads the required languages and their translations for the current Tolgee instance.
      *

core/src/androidMain/kotlin/io/tolgee/TolgeeResources.kt

@@ -2,10 +2,10 @@ package io.tolgee
 
 import android.content.Context
 import android.content.res.Resources
-import android.util.Log
 import io.tolgee.common.getQuantityStringT
 import io.tolgee.common.getStringArrayT
 import io.tolgee.common.getStringT
+import io.tolgee.common.getTextT
 
 /**
  * Ignore Deprecation: Resources constructor is not really deprecated, apps should just not create
@@ -40,6 +40,6 @@ internal class TolgeeResources(
     }
 
     override fun getText(id: Int): CharSequence {
-        return baseContext.getStringT(tolgee, id)
+        return baseContext.getTextT(tolgee, id)
     }
 }

core/src/androidMain/kotlin/io/tolgee/common/ExtendTolgee.android.kt

@@ -149,6 +149,26 @@ fun Resources.getStringArrayT(tolgee: Tolgee, @ArrayRes resId: Int): Array<Strin
     return list?.ifEmpty { null }?.toTypedArray() ?: this.getStringArray(resId)
 }
 
+/**
+ * Returns a localized formatted string from [Tolgee] cache or the application's package's
+ * default string table, substituting the format arguments as defined in
+ * [java.util.Formatter] and [java.lang.String.format].
+ *
+ * This function will fall back to the Android `getText` method if no translation is found - preserving formatting.
+ * If translation is found, no style information is preserved and the method acts the same as [getStringT].
+ *
+ * @param tolgee The [Tolgee] instance to get the cached string from.
+ * @param resId Resource id for the format string
+ * @return The string data associated with the resource, formatted and
+ *         stripped of styled text information.
+ */
+fun Context.getTextT(tolgee: Tolgee, @StringRes resId: Int): CharSequence {
+    return (tolgee as? TolgeeAndroid)?.tStyled(this, resId)
+        ?: TolgeeAndroid.getKeyFromResources(this, resId)?.let {
+            tolgee.t(key = it, parameters = TolgeeMessageParams.None)
+        } ?: this.getText(resId)
+}
+
 internal actual val platformStorage: TolgeeStorageProvider?
     get() = null
 

core/src/androidMain/kotlin/io/tolgee/storage/TolgeeStorageProviderAndroid.kt

@@ -1,35 +1,48 @@
 package io.tolgee.storage
 
 import android.content.Context
+import dev.datlag.tooling.canReadSafely
+import dev.datlag.tooling.canWriteSafely
+import dev.datlag.tooling.existsSafely
+import dev.datlag.tooling.mkdirsSafely
+import dev.datlag.tooling.scopeCatching
 import java.io.File
 
 class TolgeeStorageProviderAndroid(
-  private val context: Context,
-  private val versionCode: Int,
-  private val path: String = "tolgee/localization-cache",
+    private val context: Context,
+    private val versionCode: Int,
+    private val path: String = "tolgee/localization-cache",
 ) : TolgeeStorageProvider {
-  private val cacheDir get() = context.filesDir / path / versionCode.toString()
+    private val cacheDir get() = context.filesDir / path / versionCode.toString()
 
-  override fun put(name: String, data: ByteArray) {
-    val dir = cacheDir
-    dir.mkdirs()
-    val file = dir / escape(name)
-    file.writeBytes(data)
-  }
+    override fun put(name: String, data: ByteArray) {
+        val dir = cacheDir
+        dir.mkdirsSafely()
+        val file = dir / escape(name)
+        if (!file.canWriteSafely()) {
+            return
+        }
+        scopeCatching {
+            file.writeBytes(data)
+        }
+    }
+
+    override fun get(name: String): ByteArray? {
+        val file = cacheDir / escape(name)
+        if (!file.existsSafely() || !file.canReadSafely()) {
+            return null
+        }
 
-  override fun get(name: String): ByteArray? {
-    val file = cacheDir / escape(name)
-    if (!file.exists()) {
-      return null
+        return scopeCatching {
+            file.readBytes()
+        }.getOrNull()
     }
-    return file.readBytes()
-  }
 
-  private fun escape(name: String): String {
-    return name.replace("/", "_")
-  }
+    private fun escape(name: String): String {
+        return name.replace("/", "_")
+    }
 
-  internal companion object {
-    private infix operator fun File.div(other: String) = File(this, other)
-  }
+    internal companion object {
+        private infix operator fun File.div(other: String) = File(this, other)
+    }
 }

core/src/appleMain/kotlin/io/tolgee/TolgeeApple.kt

@@ -171,7 +171,6 @@ data class TolgeeApple internal constructor(
             table: String?,
             vararg args: Any
         ): String? {
-            // FIXME: why not just expand the args?? is there some weird limitation with calling the c functions?
             return (getLocalizedStringFromBundle(res, key, default, table) ?: default?.ifBlank { null })?.let { format ->
                 when (args.size) {
                     0 -> NSString.localizedStringWithFormat(format)

core/src/commonMain/kotlin/io/tolgee/Tolgee.kt

@@ -744,7 +744,7 @@ open class Tolgee(
          */
         @JvmStatic
         val instance: PlatformTolgee
-        get() = _instance.value ?: throw IllegalStateException("Tolgee instance not initialized")
+            get() = _instance.value ?: throw IllegalStateException("Tolgee instance not initialized")
 
         /**
          * Initializes the Tolgee framework with the specified configuration and sets it as the global instance.

core/src/commonMain/kotlin/io/tolgee/common/ExtendParser.kt

@@ -13,7 +13,6 @@ import kotlinx.serialization.json.*
  * @return The string representation of the [JsonElement], or an empty string if it cannot be resolved.
  */
 internal fun JsonElement.stringValue(): String = when (this) {
-    // FIXME: Whyyy; either its primitive or its an error/non-existent key
     is JsonPrimitive -> contentOrNull ?: ""
     is JsonArray -> firstOrNull()?.stringValue() ?: ""
     is JsonObject -> this.values.firstOrNull()?.stringValue() ?: ""

core/src/commonMain/kotlin/io/tolgee/storage/TolgeeStorageProvider.kt

@@ -1,6 +1,6 @@
 package io.tolgee.storage
 
 interface TolgeeStorageProvider {
-  fun put(name: String, data: ByteArray)
-  fun get(name: String): ByteArray?
+    fun put(name: String, data: ByteArray)
+    fun get(name: String): ByteArray?
 }

demo/exampleandroid/src/main/AndroidManifest.xml

@@ -9,7 +9,8 @@
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
-            android:supportsRtl="true">
+            android:supportsRtl="true"
+            android:networkSecurityConfig="@xml/network_security">
         <activity
                 android:name=".MainActivity"
                 android:exported="true">

demo/exampleandroid/src/main/res/xml/network_security.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <domain-config>
+        <domain includeSubdomains="true">tolgee.io</domain>
+        <domain includeSubdomains="true">tolg.ee</domain>
+    </domain-config>
+</network-security-config>