Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/src/main/java/com/chiller3/basicsync/Preferences.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
* SPDX-FileCopyrightText: 2023-2026 Andrew Gunnerson
* SPDX-License-Identifier: GPL-3.0-only
*/

Expand All @@ -19,6 +19,7 @@ class Preferences(context: Context) {
// Main preferences.
const val PREF_REQUIRE_UNMETERED_NETWORK = "require_unmetered_network"
const val PREF_REQUIRE_SUFFICIENT_BATTERY = "require_sufficient_battery"
const val PREF_RESPECT_BATTERY_SAVER = "respect_battery_saver"
const val PREF_KEEP_ALIVE = "keep_alive"

// Main UI actions only.
Expand Down Expand Up @@ -58,6 +59,10 @@ class Preferences(context: Context) {
get() = prefs.getBoolean(PREF_REQUIRE_SUFFICIENT_BATTERY, true)
set(enabled) = prefs.edit { putBoolean(PREF_REQUIRE_SUFFICIENT_BATTERY, enabled) }

var respectBatterySaver: Boolean
get() = prefs.getBoolean(PREF_RESPECT_BATTERY_SAVER, true)
set(enabled) = prefs.edit { putBoolean(PREF_RESPECT_BATTERY_SAVER, enabled) }

var keepAlive: Boolean
get() = prefs.getBoolean(PREF_KEEP_ALIVE, true)
set(enabled) = prefs.edit { putBoolean(PREF_KEEP_ALIVE, enabled) }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2025 Andrew Gunnerson
* SPDX-FileCopyrightText: 2025-2026 Andrew Gunnerson
* SPDX-License-Identifier: GPL-3.0-only
*/

Expand All @@ -22,6 +22,7 @@ import android.os.BatteryManager
import android.os.Binder
import android.os.Build
import android.os.IBinder
import android.os.PowerManager
import android.util.Log
import androidx.annotation.GuardedBy
import androidx.annotation.WorkerThread
Expand Down Expand Up @@ -179,6 +180,7 @@ class SyncthingService : Service(), SyncthingStatusReceiver,
private lateinit var prefs: Preferences
private lateinit var notifications: Notifications
private lateinit var connectivityManager: ConnectivityManager
private lateinit var powerManager: PowerManager
private val runnerThread = Thread(::runner)

private val stateLock = Object()
Expand All @@ -194,6 +196,8 @@ class SyncthingService : Service(), SyncthingStatusReceiver,
private var networkSufficient = false
@GuardedBy("stateLock")
private var batterySufficient = false
@GuardedBy("stateLock")
private var isBatterySaverMode = false

@GuardedBy("stateLock")
private var runningProxyInfo: ProxyInfo? = null
Expand All @@ -205,6 +209,7 @@ class SyncthingService : Service(), SyncthingStatusReceiver,
get() = networkConnected
&& (!prefs.requireUnmeteredNetwork || networkSufficient)
&& (!prefs.requireSufficientBattery || batterySufficient)
&& (!prefs.respectBatterySaver || !isBatterySaverMode)

private val shouldRun: Boolean
@GuardedBy("stateLock")
Expand Down Expand Up @@ -314,6 +319,18 @@ class SyncthingService : Service(), SyncthingStatusReceiver,
}
}

private val batterySaverReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
synchronized(stateLock) {
isBatterySaverMode = powerManager.isPowerSaveMode

Log.d(TAG, "Battery saver mode changed: $isBatterySaverMode")

stateChanged()
}
}
}

private val proxyChangeReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
Log.d(TAG, "Proxy settings changed")
Expand Down Expand Up @@ -344,7 +361,11 @@ class SyncthingService : Service(), SyncthingStatusReceiver,
connectivityManager = getSystemService(ConnectivityManager::class.java)
connectivityManager.registerDefaultNetworkCallback(networkCallback)

powerManager = getSystemService(PowerManager::class.java)
isBatterySaverMode = powerManager.isPowerSaveMode

registerReceiver(batteryStatusReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
registerReceiver(batterySaverReceiver, IntentFilter(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED))
registerReceiver(proxyChangeReceiver, IntentFilter(Proxy.PROXY_CHANGE_ACTION))

runnerThread.start()
Expand Down Expand Up @@ -398,6 +419,7 @@ class SyncthingService : Service(), SyncthingStatusReceiver,
Preferences.PREF_MANUAL_SHOULD_RUN,
Preferences.PREF_REQUIRE_UNMETERED_NETWORK,
Preferences.PREF_REQUIRE_SUFFICIENT_BATTERY,
Preferences.PREF_RESPECT_BATTERY_SAVER,
Preferences.PREF_KEEP_ALIVE -> stateChanged()
Preferences.PREF_DEBUG_MODE -> setLogLevel()
}
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2025 Andrew Gunnerson
SPDX-FileCopyrightText: 2025-2026 Andrew Gunnerson
SPDX-License-Identifier: GPL-3.0-only
-->
<resources>
Expand Down Expand Up @@ -33,6 +33,8 @@
<string name="pref_require_unmetered_network_desc">Only run if the device is connected to an unmetered network (eg. Wi-Fi).</string>
<string name="pref_require_sufficient_battery_name">Require sufficient battery level</string>
<string name="pref_require_sufficient_battery_desc">Only run if the battery level is not low or if the device is charging.</string>
<string name="pref_respect_battery_saver_name">Respect battery saver mode</string>
<string name="pref_respect_battery_saver_desc">Only run when Android\'s battery saver mode is disabled.</string>
<string name="pref_keep_alive_name">Keep Syncthing alive</string>
<string name="pref_keep_alive_desc">When Syncthing should not run, pause it instead of shutting it down. The avoids a potential performance hit when scanning large folders on startup.</string>
<string name="pref_version_name">Version</string>
Expand Down
9 changes: 8 additions & 1 deletion app/src/main/res/xml/preferences_root.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
SPDX-FileCopyrightText: 2023-2025 Andrew Gunnerson
SPDX-FileCopyrightText: 2023-2026 Andrew Gunnerson
SPDX-License-Identifier: GPL-3.0-only
-->
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
Expand Down Expand Up @@ -96,6 +96,13 @@
app:summary="@string/pref_require_sufficient_battery_desc"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
app:key="respect_battery_saver"
app:defaultValue="true"
app:title="@string/pref_respect_battery_saver_name"
app:summary="@string/pref_respect_battery_saver_desc"
app:iconSpaceReserved="false" />

<SwitchPreferenceCompat
app:key="keep_alive"
app:defaultValue="true"
Expand Down