diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt index f2ea49eb0..fa578144c 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/settings/AdvancedScreen.kt @@ -50,7 +50,6 @@ import com.hippo.ehviewer.util.displayPath import com.hippo.ehviewer.util.getAppLanguage import com.hippo.ehviewer.util.getLanguages import com.hippo.ehviewer.util.isAtLeastO -import com.hippo.ehviewer.util.isAtLeastV import com.hippo.ehviewer.util.sendTo import com.hippo.ehviewer.util.setAppLanguage import com.hippo.files.delete @@ -203,12 +202,11 @@ fun AdvancedScreen(navigator: DestinationsNavigator) { value = Settings::desktopSite, ) val exportFailed = stringResource(id = R.string.settings_advanced_export_data_failed) - val now = ReadableTime.getFilenamableTime() LauncherPreference( title = stringResource(id = R.string.settings_advanced_export_data), summary = stringResource(id = R.string.settings_advanced_export_data_summary), - contract = ActivityResultContracts.CreateDocument("application/vnd.sqlite3"), - key = if (isAtLeastV) now else "$now.db", + contract = ActivityResultContracts.CreateDocument("application/octet-stream"), + key = ReadableTime.getFilenamableTime() + ".db", ) { uri -> uri?.let { context.runCatching { @@ -227,7 +225,7 @@ fun AdvancedScreen(navigator: DestinationsNavigator) { title = stringResource(id = R.string.settings_advanced_import_data), summary = stringResource(id = R.string.settings_advanced_import_data_summary), contract = ActivityResultContracts.GetContent(), - key = if (isAtLeastV) "application/vnd.sqlite3" else "application/octet-stream", + key = "application/octet-stream", ) { uri -> uri?.let { context.runCatching { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt b/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt index 09f3b0942..71f2f6ab2 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/util/SDKUtils.kt @@ -2,7 +2,6 @@ package com.hippo.ehviewer.util import android.os.Build import android.os.ext.SdkExtensions -import androidx.core.os.BuildCompat val isAtLeastN = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N val isAtLeastO = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O @@ -13,5 +12,4 @@ val isAtLeastR = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R val isAtLeastS = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S val isAtLeastT = Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU val isAtLeastU = Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE -val isAtLeastV = BuildCompat.isAtLeastV() val isAtLeastSExtension7 = isAtLeastR && SdkExtensions.getExtensionVersion(Build.VERSION_CODES.S) >= 7