From 51d677542906845f879e581c340b5ede22e2196b Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Mon, 18 Aug 2025 21:36:39 +0800 Subject: [PATCH] Remove unnecessary JNI lib and main thread check The actual disk I/O will perform in the scope of DataStore. --- app/build.gradle.kts | 3 +++ .../ehviewer/core/preferences/DataStorePreferences.android.kt | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e3b5043b9..aced4a821 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -97,6 +97,9 @@ android { dex { useLegacyPackaging = false } + jniLibs { + excludes += "**/libdatastore_shared_counter.so" // DataStore multi-process + } resources { // Required by Layout Inspector pickFirsts += "/META-INF/androidx.compose.ui_ui.version" diff --git a/core/data/src/androidMain/kotlin/com/ehviewer/core/preferences/DataStorePreferences.android.kt b/core/data/src/androidMain/kotlin/com/ehviewer/core/preferences/DataStorePreferences.android.kt index 12e3ee501..f145e3d43 100644 --- a/core/data/src/androidMain/kotlin/com/ehviewer/core/preferences/DataStorePreferences.android.kt +++ b/core/data/src/androidMain/kotlin/com/ehviewer/core/preferences/DataStorePreferences.android.kt @@ -5,11 +5,9 @@ import androidx.datastore.preferences.SharedPreferencesMigration import androidx.datastore.preferences.core.PreferenceDataStoreFactory import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.preferencesDataStoreFile -import com.ehviewer.core.mainthread.checkNotMainThread import splitties.init.appCtx internal actual fun getDateStore(name: String?): DataStore { - checkNotMainThread() val context = appCtx val actualName = name ?: "${context.packageName}_preferences" return PreferenceDataStoreFactory.create(