empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add acknowledgements from libsigna/ringrtc.

Browse source
This commit is contained in:
Greyson Parrelli 2024-05-17 12:19:41 -04:00 • committed by Cody Henthorne
parent 689ee243aa
commit 6f2cce1494
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/help/LicenseFragment.kt
View file

@ -26,6 +26,7 @@ import org.signal.core.ui.Scaffolds
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.compose.ComposeFragment import org.thoughtcrime.securesms.compose.ComposeFragment
import java.io.InputStream
class LicenseFragment : ComposeFragment() { class LicenseFragment : ComposeFragment() {
private val TAG = Log.tag(LicenseFragment::class.java) private val TAG = Log.tag(LicenseFragment::class.java)
@ -34,9 +35,9 @@ class LicenseFragment : ComposeFragment() {
override fun FragmentContent() { override fun FragmentContent() {
val textState: State<List<String>> = Single val textState: State<List<String>> = Single
.fromCallable { .fromCallable {
requireContext().resources.openRawResource(R.raw.third_party_licenses).bufferedReader().use { requireContext().resources.openRawResource(R.raw.third_party_licenses).readToLines() +
it.readText().split("\n") requireContext().assets.open("acknowledgments/libsignal.md").readToLines() +
} requireContext().assets.open("acknowledgments/ringrtc.md").readToLines()
} }
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
@ -74,3 +75,7 @@ fun LicenseScreen(licenseTextLines: List<String>, modifier: Modifier = Modifier)
fun LicenseFragmentPreview() { fun LicenseFragmentPreview() {
LicenseScreen(listOf("Lorem ipsum", "Delor")) LicenseScreen(listOf("Lorem ipsum", "Delor"))
} }
private fun InputStream.readToLines(): List<String> {
return this.bufferedReader().use { it.readText().split("\n") }
}