Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
naveensingh merged 2 commits into from
Mar 9, 2025
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b27164a
Allow importing files with MIME type "application/octet-stream"
tom93 Feb 14, 2025
8c52c68
Merge branch 'master' into pr/fix-import-binary-mime-type
naveensingh Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions app/src/main/kotlin/org/fossify/phone/activities/SettingsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,23 @@ import kotlin.system.exitProcess
class SettingsActivity : SimpleActivity() {
companion object {
private const val CALL_HISTORY_FILE_TYPE = "application/json"
private val IMPORT_CALL_HISTORY_FILE_TYPES = buildList {
add("application/json")
if (!isQPlus()) {
// Workaround for https://github.com/FossifyOrg/Messages/issues/88
add("application/octet-stream")
}
}
}

private val binding by viewBinding(ActivitySettingsBinding::inflate)
private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
if (uri != null) {
toast(R.string.importing)
importCallHistory(uri)
private val getContent =
registerForActivityResult(ActivityResultContracts.OpenDocument()) { uri ->
if (uri != null) {
toast(R.string.importing)
importCallHistory(uri)
}
}
}

private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(CALL_HISTORY_FILE_TYPE)) { uri ->
if (uri != null) {
Expand Down Expand Up @@ -342,7 +350,7 @@ class SettingsActivity : SimpleActivity() {

private fun setupCallsImport() {
binding.settingsImportCallsHolder.setOnClickListener {
getContent.launch(CALL_HISTORY_FILE_TYPE)
getContent.launch(IMPORT_CALL_HISTORY_FILE_TYPES.toTypedArray())
}
}

Expand Down