Skip to content

Commit 29e4509

Browse files
committed
Moved ActivityResult properties
1 parent 26cd68b commit 29e4509

File tree

1 file changed

+20
-22
lines changed

1 file changed

+20
-22
lines changed

app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import com.simplemobiletools.notes.pro.helpers.*
1818
import com.simplemobiletools.notes.pro.models.Note
1919
import com.simplemobiletools.notes.pro.models.Widget
2020
import kotlinx.android.synthetic.main.activity_settings.*
21-
import kotlinx.android.synthetic.main.activity_settings.view.settings_migrating_label
2221
import kotlinx.serialization.SerializationException
2322
import kotlinx.serialization.decodeFromString
2423
import kotlinx.serialization.encodeToString
@@ -27,29 +26,8 @@ import java.util.Locale
2726
import kotlin.system.exitProcess
2827

2928
class SettingsActivity : SimpleActivity() {
30-
3129
private val notesFileType = "application/json"
3230

33-
private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
34-
if (uri != null) {
35-
toast(R.string.importing)
36-
importNotes(uri)
37-
}
38-
}
39-
40-
private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri ->
41-
if (uri != null) {
42-
toast(R.string.exporting)
43-
NotesHelper(this).getNotes { notes ->
44-
requestUnlockNotes(notes) { unlockedNotes ->
45-
val notLockedNotes = notes.filterNot { it.isLocked() }
46-
val notesToExport = unlockedNotes + notLockedNotes
47-
exportNotes(notesToExport, uri)
48-
}
49-
}
50-
}
51-
}
52-
5331
override fun onCreate(savedInstanceState: Bundle?) {
5432
isMaterialActivity = true
5533
super.onCreate(savedInstanceState)
@@ -100,6 +78,26 @@ class SettingsActivity : SimpleActivity() {
10078
return super.onCreateOptionsMenu(menu)
10179
}
10280

81+
private val getContent = registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
82+
if (uri != null) {
83+
toast(R.string.importing)
84+
importNotes(uri)
85+
}
86+
}
87+
88+
private val saveDocument = registerForActivityResult(ActivityResultContracts.CreateDocument(notesFileType)) { uri ->
89+
if (uri != null) {
90+
toast(R.string.exporting)
91+
NotesHelper(this).getNotes { notes ->
92+
requestUnlockNotes(notes) { unlockedNotes ->
93+
val notLockedNotes = notes.filterNot { it.isLocked() }
94+
val notesToExport = unlockedNotes + notLockedNotes
95+
exportNotes(notesToExport, uri)
96+
}
97+
}
98+
}
99+
}
100+
103101
private fun setupCustomizeColors() {
104102
settings_color_customization_holder.setOnClickListener {
105103
startCustomizationActivity()

0 commit comments

Comments
 (0)