fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-17 03:51:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

move the export path remembering in the dialog itself

Browse Source
This commit is contained in:
tibbi 2020-03-17 16:39:57 +01:00
parent 77bc0a92b5
commit 9c622a30bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
View File

@ -519,7 +519,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
private fun tryExportContacts() { private fun tryExportContacts() {
if (isQPlus()) { if (isQPlus()) {
ExportContactsDialog(this, config.lastExportPath, true) { file, ignoredContactSources -> ExportContactsDialog(this, config.lastExportPath, true) { file, ignoredContactSources ->
config.lastExportPath = file.absolutePath.getParentPath()
ignoredExportContactSources = ignoredContactSources ignoredExportContactSources = ignoredContactSources
Intent(Intent.ACTION_CREATE_DOCUMENT).apply { Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
@ -534,7 +533,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
handlePermission(PERMISSION_WRITE_STORAGE) { handlePermission(PERMISSION_WRITE_STORAGE) {
if (it) { if (it) {
ExportContactsDialog(this, config.lastExportPath, false) { file, ignoredContactSources -> ExportContactsDialog(this, config.lastExportPath, false) { file, ignoredContactSources ->
config.lastExportPath = file.absolutePath.getParentPath()
getFileOutputStream(file.toFileDirItem(this), true) { getFileOutputStream(file.toFileDirItem(this), true) {
exportContactsTo(ignoredContactSources, it) exportContactsTo(ignoredContactSources, it)
} }

2
app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/ExportContactsDialog.kt
View File

@ -8,6 +8,7 @@ import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.R
import com.simplemobiletools.contacts.pro.activities.SimpleActivity import com.simplemobiletools.contacts.pro.activities.SimpleActivity
import com.simplemobiletools.contacts.pro.adapters.FilterContactSourcesAdapter import com.simplemobiletools.contacts.pro.adapters.FilterContactSourcesAdapter
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources import com.simplemobiletools.contacts.pro.extensions.getVisibleContactSources
import com.simplemobiletools.contacts.pro.helpers.ContactsHelper import com.simplemobiletools.contacts.pro.helpers.ContactsHelper
import com.simplemobiletools.contacts.pro.models.ContactSource import com.simplemobiletools.contacts.pro.models.ContactSource
@ -69,6 +70,7 @@ class ExportContactsDialog(val activity: SimpleActivity, val path: String, val h
ignoreClicks = true ignoreClicks = true
ensureBackgroundThread { ensureBackgroundThread {
activity.config.lastExportPath = file.absolutePath.getParentPath()
val selectedSources = (view.export_contacts_list.adapter as FilterContactSourcesAdapter).getSelectedContactSources() val selectedSources = (view.export_contacts_list.adapter as FilterContactSourcesAdapter).getSelectedContactSources()
val ignoredSources = contactSources.filter { !selectedSources.contains(it) }.map { it.getFullIdentifier() }.toHashSet() val ignoredSources = contactSources.filter { !selectedSources.contains(it) }.map { it.getFullIdentifier() }.toHashSet()
callback(file, ignoredSources) callback(file, ignoredSources)