From 6f2cce1494ead4eb7d7c5e62c2ab1618c7fdd530 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 17 May 2024 12:19:41 -0400 Subject: [PATCH] Add acknowledgements from libsigna/ringrtc. --- .../components/settings/app/help/LicenseFragment.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt index d4b692c951..7ac873bf2f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt @@ -26,6 +26,7 @@ import org.signal.core.ui.Scaffolds import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.compose.ComposeFragment +import java.io.InputStream class LicenseFragment : ComposeFragment() { private val TAG = Log.tag(LicenseFragment::class.java) @@ -34,9 +35,9 @@ class LicenseFragment : ComposeFragment() { override fun FragmentContent() { val textState: State> = Single .fromCallable { - requireContext().resources.openRawResource(R.raw.third_party_licenses).bufferedReader().use { - it.readText().split("\n") - } + requireContext().resources.openRawResource(R.raw.third_party_licenses).readToLines() + + requireContext().assets.open("acknowledgments/libsignal.md").readToLines() + + requireContext().assets.open("acknowledgments/ringrtc.md").readToLines() } .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) @@ -74,3 +75,7 @@ fun LicenseScreen(licenseTextLines: List, modifier: Modifier = Modifier) fun LicenseFragmentPreview() { LicenseScreen(listOf("Lorem ipsum", "Delor")) } + +private fun InputStream.readToLines(): List { + return this.bufferedReader().use { it.readText().split("\n") } +}