fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

add handling for importing settings with scoped storage

Browse Source
This commit is contained in:
tibbi
2020-03-17 19:18:51 +01:00
parent 89519ab78c
commit 6bbdd935d1
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
View File

@@ -1,5 +1,6 @@
package com.simplemobiletools.calendar.pro.activities package com.simplemobiletools.calendar.pro.activities
import android.app.Activity
import android.app.TimePickerDialog import android.app.TimePickerDialog
import android.content.Intent import android.content.Intent
import android.content.res.Resources import android.content.res.Resources
@@ -20,10 +21,12 @@ import com.simplemobiletools.commons.models.RadioItem
import kotlinx.android.synthetic.main.activity_settings.* import kotlinx.android.synthetic.main.activity_settings.*
import org.joda.time.DateTime import org.joda.time.DateTime
import java.io.File import java.io.File
import java.io.InputStream
import java.util.* import java.util.*
class SettingsActivity : SimpleActivity() { class SettingsActivity : SimpleActivity() {
private val GET_RINGTONE_URI = 1 private val GET_RINGTONE_URI = 1
private val PICK_IMPORT_SOURCE_INTENT = 2
lateinit var res: Resources lateinit var res: Resources
private var mStoredPrimaryColor = 0 private var mStoredPrimaryColor = 0
@@ -105,6 +108,9 @@ class SettingsActivity : SimpleActivity() {
if (requestCode == GET_RINGTONE_URI && resultCode == RESULT_OK && resultData != null) { if (requestCode == GET_RINGTONE_URI && resultCode == RESULT_OK && resultData != null) {
val newAlarmSound = storeNewYourAlarmSound(resultData) val newAlarmSound = storeNewYourAlarmSound(resultData)
updateReminderSound(newAlarmSound) updateReminderSound(newAlarmSound)
} else if (requestCode == PICK_IMPORT_SOURCE_INTENT && resultCode == Activity.RESULT_OK && resultData != null && resultData.data != null) {
val inputStream = contentResolver.openInputStream(resultData.data!!)
parseFile(inputStream)
} }
} }
@@ -703,14 +709,18 @@ class SettingsActivity : SimpleActivity() {
private fun setupImportSettings() { private fun setupImportSettings() {
settings_import_holder.setOnClickListener { settings_import_holder.setOnClickListener {
if (isQPlus()) {
Intent(Intent.ACTION_GET_CONTENT).apply {
addCategory(Intent.CATEGORY_OPENABLE)
type = "text/plain"
startActivityForResult(this, PICK_IMPORT_SOURCE_INTENT)
}
} else {
handlePermission(PERMISSION_READ_STORAGE) { handlePermission(PERMISSION_READ_STORAGE) {
if (it) { if (it) {
FilePickerDialog(this) { FilePickerDialog(this) {
ensureBackgroundThread { ensureBackgroundThread {
try { parseFile(File(it).inputStream())
parseFile(it)
} catch (e: Exception) {
showErrorToast(e)
} }
} }
} }
@@ -719,8 +729,12 @@ class SettingsActivity : SimpleActivity() {
} }
} }
private fun parseFile(path: String) { private fun parseFile(inputStream: InputStream?) {
val inputStream = File(path).inputStream() if (inputStream == null) {
toast(R.string.unknown_error_occurred)
return
}
var importedItems = 0 var importedItems = 0
val configValues = LinkedHashMap<String, Any>() val configValues = LinkedHashMap<String, Any>()
inputStream.bufferedReader().use { inputStream.bufferedReader().use {