[fix] imported title is correctly stripped from html.

SecUSo · Oct 22, 2024 · e38866a · e38866a
1 parent 0e1ee37
commit e38866a
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/app/src/main/java/org/secuso/privacyfriendlynotes/ui/notes/TextNoteActivity.kt b/app/src/main/java/org/secuso/privacyfriendlynotes/ui/notes/TextNoteActivity.kt
@@ -143,19 +143,18 @@ class TextNoteActivity : BaseNoteActivity(DbContract.NoteEntry.TYPE_TEXT) {
         if (intent != null) {
             val uri: Uri? = listOf(intent.data, intent.getParcelableExtra(Intent.EXTRA_STREAM)).firstNotNullOfOrNull { it }
             if (uri != null) {
-                val text = InputStreamReader(contentResolver.openInputStream(uri)).readLines()
-                if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("settings_import_text_title_file_first_line", false)) {
-                    super.setTitle(text[0])
-                    etContent.setText(Html.fromHtml(text.subList(1, text.size).joinToString("<br>")))
-                } else {
-                    val title = uri.path?.let { File(it).nameWithoutExtension } ?: ""
-                    super.setTitle(title)
-                    etContent.setText(Html.fromHtml(text.joinToString("<br>")))
+                val (title: String, text) = InputStreamReader(contentResolver.openInputStream(uri)).readLines().let {
+                    if (PreferenceManager.getDefaultSharedPreferences(this@TextNoteActivity).getBoolean("settings_import_text_title_file_first_line", false)) {
+                        it[0] to it.subList(1, it.size)
+                    } else {
+                        (uri.path?.let { file -> File(file).nameWithoutExtension } ?: "") to it
+                    }
                 }
+                super.setTitle(Html.fromHtml(title).toString())
+                etContent.setText(Html.fromHtml(text.joinToString("<br>")))
             }
-            val text = intent.getStringExtra(Intent.EXTRA_TEXT)
-            if (text != null) {
-                etContent.setText(Html.fromHtml(text))
+            intent.getStringExtra(Intent.EXTRA_TEXT)?.let {
+                etContent.setText(Html.fromHtml(it))
             }
         }
     }