mirror/Notes
1
0
Fork 0
mirror of https://github.com/FossifyOrg/Notes.git synced 2026-06-11 10:09:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow importing files with MIME type "application/octet-stream"

Browse Source 
Ported from FossifyOrg/Messages#137.

Sometimes Android reports the MIME type as "application/octet-stream"
even if the file has a .json extension (specifically, on Android 8 and
9 for backups exported outside the Download folder). Previously, such
files could not be selected in the file picker when importing.

As a workaround, allow files with that MIME type on Android < 10.

Fixes #34.
This commit is contained in:
Tom Levy
2025-02-14 08:37:34 +00:00
parent 84cdfc48c4
commit ec0a8420da
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/kotlin/org/fossify/notes/activities/SettingsActivity.kt
View File

@@ -32,6 +32,14 @@ import kotlin.system.exitProcess
class SettingsActivity : SimpleActivity() {
private val notesFileType = "application/json"
private val notesImportFileTypes = buildList {
add("application/json")
if (!isQPlus()) {
// Workaround for https://github.com/FossifyOrg/Notes/issues/34
add("application/octet-stream")
}
}
private val binding by viewBinding(ActivitySettingsBinding::inflate)
override fun onCreate(savedInstanceState: Bundle?) {
@@ -89,12 +97,13 @@ class SettingsActivity : SimpleActivity() {
return super.onCreateOptionsMenu(menu)
}
private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
if (uri != null) {
toast(org.fossify.commons.R.string.importing)
importNotes(uri)
private val getContent =
registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
if (uri != null) {
toast(org.fossify.commons.R.string.importing)
importNotes(uri)
}
}
}
private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri ->
if (uri != null) {
@@ -315,7 +324,7 @@ class SettingsActivity : SimpleActivity() {
private fun setupNotesImport() {
binding.settingsImportNotesHolder.setOnClickListener {
getContent.launch(notesFileType)
getContent.launch(notesImportFileTypes.toTypedArray())
}
}