Allow */* as mime type filter when restoring, solves #223
This commit is contained in:
parent
0e0318f88d
commit
400f72a9bf
3 changed files with 5 additions and 2 deletions
|
@ -283,7 +283,6 @@ class Backuper(val context: Context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val MIME_TYPE = "application/json"
|
|
||||||
private const val FILE_MAGIC = "ntfy2586"
|
private const val FILE_MAGIC = "ntfy2586"
|
||||||
private const val FILE_VERSION = 1
|
private const val FILE_VERSION = 1
|
||||||
private const val TAG = "NtfyExporter"
|
private const val TAG = "NtfyExporter"
|
||||||
|
|
|
@ -481,7 +481,10 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
restore?.onPreferenceClickListener = OnPreferenceClickListener {
|
restore?.onPreferenceClickListener = OnPreferenceClickListener {
|
||||||
restoreResultLauncher.launch(Backuper.MIME_TYPE)
|
// Overly open mime type filter (because of https://github.com/binwiederhier/ntfy/issues/223).
|
||||||
|
// This filter could likely be stricter if we'd write the mime type properly in Backuper.backup(),
|
||||||
|
// but just in case we want to restore from a file we didn't write outselves, we'll keep this "*/*".
|
||||||
|
restoreResultLauncher.launch("*/*")
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@ Features:
|
||||||
Bugs:
|
Bugs:
|
||||||
* Accurate naming of "mute notifications" from "pause notifications" (#224, thanks to @shadow00 for reporting)
|
* Accurate naming of "mute notifications" from "pause notifications" (#224, thanks to @shadow00 for reporting)
|
||||||
* Make messages with links selectable (#226, thanks to @StoyanDimitrov for reporting)
|
* Make messages with links selectable (#226, thanks to @StoyanDimitrov for reporting)
|
||||||
|
* Restoring topics or settings from backup doesn't work (#223, thanks to @shadow00 for reporting)
|
||||||
|
|
||||||
**Thanks for testing:**
|
**Thanks for testing:**
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue