Skip to content

Commit 6199d30

Browse files
committed
refactor: utilize custom resource util methods to reset assets
1 parent 571e7c4 commit 6199d30

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

app/src/main/java/com/osfans/trime/ui/fragments/ProfileFragment.kt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.lifecycle.lifecycleScope
2020
import androidx.preference.Preference
2121
import androidx.preference.SwitchPreferenceCompat
2222
import androidx.preference.get
23-
import com.blankj.utilcode.util.ResourceUtils
2423
import com.blankj.utilcode.util.ToastUtils
2524
import com.blankj.utilcode.util.UriUtils
2625
import com.osfans.trime.R
@@ -31,6 +30,7 @@ import com.osfans.trime.data.base.DataManager
3130
import com.osfans.trime.ui.components.FolderPickerPreference
3231
import com.osfans.trime.ui.components.PaddingPreferenceFragment
3332
import com.osfans.trime.ui.main.MainViewModel
33+
import com.osfans.trime.util.ResourceUtils
3434
import com.osfans.trime.util.appContext
3535
import com.osfans.trime.util.formatDateTime
3636
import com.osfans.trime.util.rimeActionWithResultDialog
@@ -207,18 +207,14 @@ class ProfileFragment :
207207
var res = true
208208
lifecycleScope.withLoadingDialog(context) {
209209
withContext(Dispatchers.IO) {
210-
for ((i, a) in items.withIndex()) {
211-
if (checkedItems[i]) {
212-
res = res and (
213-
runCatching {
214-
ResourceUtils.copyFileFromAssets(
215-
"rime/$a",
216-
"${DataManager.sharedDataDir.absolutePath}/$a",
217-
)
218-
}.getOrNull() ?: false
219-
)
210+
res =
211+
items.fold(true) { acc, asset ->
212+
ResourceUtils.copyFile(asset, DataManager.sharedDataDir).fold({
213+
acc and true // on success
214+
}, {
215+
acc and false // on failure
216+
})
220217
}
221-
}
222218
}
223219
}
224220
ToastUtils.showShort(

0 commit comments

Comments
 (0)