minor code update

This commit is contained in:
Tibor Kaputa
2021-09-22 22:59:51 +02:00
committed by GitHub
parent cbd6e7fa60
commit ec2352e597

View File

@@ -29,14 +29,13 @@ import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
import com.simplemobiletools.smsmessenger.helpers.THREAD_TITLE import com.simplemobiletools.smsmessenger.helpers.THREAD_TITLE
import com.simplemobiletools.smsmessenger.models.Conversation import com.simplemobiletools.smsmessenger.models.Conversation
import com.simplemobiletools.smsmessenger.models.Events import com.simplemobiletools.smsmessenger.models.Events
import java.io.FileOutputStream
import java.io.OutputStream
import java.util.ArrayList
import java.util.Arrays
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
import java.io.FileOutputStream
import java.io.OutputStream
import java.util.*
class MainActivity : SimpleActivity() { class MainActivity : SimpleActivity() {
private val MAKE_DEFAULT_APP_REQUEST = 1 private val MAKE_DEFAULT_APP_REQUEST = 1
@@ -340,7 +339,6 @@ class MainActivity : SimpleActivity() {
private fun tryToExportMessages() { private fun tryToExportMessages() {
if (isQPlus()) { if (isQPlus()) {
ExportMessagesDialog(this, config.lastExportPath, true) { file -> ExportMessagesDialog(this, config.lastExportPath, true) { file ->
Intent(Intent.ACTION_CREATE_DOCUMENT).apply { Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
type = EXPORT_MIME_TYPE type = EXPORT_MIME_TYPE
putExtra(Intent.EXTRA_TITLE, file.name) putExtra(Intent.EXTRA_TITLE, file.name)
@@ -362,15 +360,15 @@ class MainActivity : SimpleActivity() {
} }
private fun exportMessagesTo(outputStream: OutputStream?) { private fun exportMessagesTo(outputStream: OutputStream?) {
toast(R.string.exporting)
ensureBackgroundThread { ensureBackgroundThread {
toast(R.string.exporting)
smsExporter.exportMessages(outputStream) { smsExporter.exportMessages(outputStream) {
toast( val toastId = when (it) {
when (it) { MessagesExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful
MessagesExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful else -> R.string.exporting_failed
else -> R.string.exporting_failed }
}
) toast(toastId)
} }
} }
} }