diff --git a/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt b/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
index a3f036a..1761e65 100644
--- a/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
@@ -131,7 +131,6 @@ class BoxService(private val service: Service, private val platformInterface: Pl
}
DefaultNetworkMonitor.start()
- Libbox.setMemoryLimit(!Settings.disableMemoryLimit)
try {
commandServer.startOrReloadService(
diff --git a/app/src/main/java/io/nekohasekai/sfa/compose/screen/settings/ServiceSettingsScreen.kt b/app/src/main/java/io/nekohasekai/sfa/compose/screen/settings/ServiceSettingsScreen.kt
index 6ed9dd4..7f89fff 100644
--- a/app/src/main/java/io/nekohasekai/sfa/compose/screen/settings/ServiceSettingsScreen.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/compose/screen/settings/ServiceSettingsScreen.kt
@@ -16,23 +16,18 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.outlined.BatteryChargingFull
-import androidx.compose.material.icons.outlined.Memory
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
-import androidx.compose.material3.ListItem
-import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
@@ -40,12 +35,9 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
@@ -53,13 +45,8 @@ import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import io.nekohasekai.sfa.R
import io.nekohasekai.sfa.bg.ServiceConnection
-import io.nekohasekai.sfa.compose.base.GlobalEventBus
-import io.nekohasekai.sfa.compose.base.UiEvent
import io.nekohasekai.sfa.compose.topbar.OverrideTopBar
-import io.nekohasekai.sfa.database.Settings
import io.nekohasekai.sfa.ktx.launchCustomTab
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@@ -79,11 +66,8 @@ fun ServiceSettingsScreen(navController: NavController, serviceConnection: Servi
}
val context = LocalContext.current
- val scope = rememberCoroutineScope()
// Check battery optimization status
var isBatteryOptimizationIgnored by remember { mutableStateOf(false) }
- var ignoreMemoryLimit by remember { mutableStateOf(Settings.disableMemoryLimit) }
-
// Activity result launcher for battery optimization permission
val requestBatteryOptimizationLauncher =
rememberLauncherForActivityResult(
@@ -187,56 +171,6 @@ fun ServiceSettingsScreen(navController: NavController, serviceConnection: Servi
}
}
- // Options Section
- Card(
- modifier =
- Modifier
- .fillMaxWidth()
- .padding(horizontal = 16.dp),
- colors =
- CardDefaults.cardColors(
- containerColor = MaterialTheme.colorScheme.surfaceContainer,
- ),
- ) {
- ListItem(
- headlineContent = {
- Text(
- stringResource(R.string.ignore_memory_limit),
- style = MaterialTheme.typography.bodyLarge,
- )
- },
- supportingContent = {
- Text(
- stringResource(R.string.ignore_memory_limit_description),
- style = MaterialTheme.typography.bodyMedium,
- color = MaterialTheme.colorScheme.onSurfaceVariant,
- modifier = Modifier.padding(top = 4.dp),
- )
- },
- leadingContent = {
- Icon(
- imageVector = Icons.Outlined.Memory,
- contentDescription = null,
- tint = MaterialTheme.colorScheme.primary,
- )
- },
- trailingContent = {
- Switch(checked = ignoreMemoryLimit, onCheckedChange = { checked ->
- ignoreMemoryLimit = checked
- scope.launch(Dispatchers.IO) {
- Settings.disableMemoryLimit = checked
- GlobalEventBus.tryEmit(UiEvent.RestartToTakeEffect)
- }
- })
- },
- modifier = Modifier.clip(RoundedCornerShape(12.dp)),
- colors =
- ListItemDefaults.colors(
- containerColor = Color.Transparent,
- ),
- )
- }
-
Spacer(modifier = Modifier.height(16.dp))
}
}
diff --git a/app/src/main/java/io/nekohasekai/sfa/constant/SettingsKey.kt b/app/src/main/java/io/nekohasekai/sfa/constant/SettingsKey.kt
index 88dbcb3..3109681 100644
--- a/app/src/main/java/io/nekohasekai/sfa/constant/SettingsKey.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/constant/SettingsKey.kt
@@ -9,7 +9,6 @@ object SettingsKey {
const val SILENT_INSTALL_ENABLED = "silent_install_enabled"
const val SILENT_INSTALL_METHOD = "silent_install_method"
const val AUTO_UPDATE_ENABLED = "auto_update_enabled"
- const val DISABLE_MEMORY_LIMIT = "disable_memory_limit"
const val DYNAMIC_NOTIFICATION = "dynamic_notification"
const val DISABLE_DEPRECATED_WARNINGS = "disable_deprecated_warnings"
diff --git a/app/src/main/java/io/nekohasekai/sfa/database/Settings.kt b/app/src/main/java/io/nekohasekai/sfa/database/Settings.kt
index 0d2ed48..23b1d8b 100644
--- a/app/src/main/java/io/nekohasekai/sfa/database/Settings.kt
+++ b/app/src/main/java/io/nekohasekai/sfa/database/Settings.kt
@@ -63,7 +63,6 @@ object Settings {
}
}
var autoUpdateEnabled by dataStore.boolean(SettingsKey.AUTO_UPDATE_ENABLED) { false }
- var disableMemoryLimit by dataStore.boolean(SettingsKey.DISABLE_MEMORY_LIMIT)
var dynamicNotification by dataStore.boolean(SettingsKey.DYNAMIC_NOTIFICATION) { true }
var disableDeprecatedWarnings by dataStore.boolean(SettingsKey.DISABLE_DEPRECATED_WARNINGS) { false }
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 3c02cd0..14e6cc8 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -199,8 +199,6 @@
حامی مالی
پوشه کاری
غیرفعالکردن هشدارهای منسوخ
- نادیده گرفتن محدودیت حافظه
- محدودیت حافظه روی sing-box اعمال نشود.
اعلانها
فعالکردن اعلان
نمایش سرعت بلادرنگ در اعلان
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 9a637ef..ae2aa0d 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -199,8 +199,6 @@
Поддержать
Рабочая директория
Отключить предупреждения об устаревании
- Игнорировать ограничение памяти
- Не применять ограничения по памяти для sing-box.
Уведомления
Включить уведомления
Отображать скорость в реальном времени в уведомлении
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index bf5c21c..8d06b38 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -199,8 +199,6 @@
赞助
工作目录
禁用弃用警告
- 忽略内存限制
- 不对 sing-box 强制执行内存限制。
通知
启用通知
在通知中显示实时网速
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 6a20f20..b9a0b99 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -199,8 +199,6 @@
贊助
工作目錄
停用過時警告
- 忽略記憶體限制
- 不對 sing-box 強制執行記憶體限制。
通知
啟用通知
在通知中顯示即時網速
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a40d5f7..c9980c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -199,8 +199,6 @@
Sponsor
Working Directory
Disable Deprecated Warnings
- Ignore Memory Limit
- Do not enforce memory limits on sing-box.
Notification
Enable Notification
Display realtime speed in notification