Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow configuring time schedule interval #1168

Merged
merged 4 commits into from
Dec 4, 2024
Merged

Allow configuring time schedule interval #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6736e6
Allow configuring time schedule interval #960
ImranR98 Oct 28, 2024
514e563
Rename a variable
ImranR98 Oct 29, 2024
72c3936
Rename a variable
ImranR98 Dec 2, 2024
1bc60ec
Rename some variables
ImranR98 Dec 3, 2024
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
17 changes: 17 additions & 0 deletions app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public static class SettingsFragment extends PreferenceFragment
private WifiSsidPreference mWifiSsidWhitelist;
private CheckBoxPreference mRunInFlightMode;
private EditTextPreference mSyncDurationMinutes;
private EditTextPreference mSleepIntervalMinutes;

/* Behaviour */
private CheckBoxPreference mStartServiceOnBoot;
Expand Down Expand Up @@ -289,6 +290,8 @@ public void onActivityCreated(Bundle savedInstanceState) {
(CheckBoxPreference) findPreference(Constants.PREF_RUN_IN_FLIGHT_MODE);
mSyncDurationMinutes =
(EditTextPreference) findPreference(Constants.PREF_SYNC_DURATION_MINUTES);
mSleepIntervalMinutes =
(EditTextPreference) findPreference(Constants.PREF_SLEEP_INTERVAL_MINUTES);

mRunOnMeteredWifi.setEnabled(mRunOnWifi.isChecked());
mUseWifiWhitelist.setEnabled(mRunOnWifi.isChecked());
Expand All @@ -307,6 +310,10 @@ public void onActivityCreated(Bundle savedInstanceState) {
getString(R.string.sync_duration_minutes_summary, mSyncDurationMinutes.getText())
);

mSleepIntervalMinutes.setSummary(
getString(R.string.sync_duration_minutes_summary, mSleepIntervalMinutes.getText())
);

mCategoryRunConditions = (PreferenceScreen) findPreference("category_run_conditions");
setPreferenceCategoryChangeListener(mCategoryRunConditions, this::onRunConditionPreferenceChange);

Expand Down Expand Up @@ -605,6 +612,16 @@ public boolean onRunConditionPreferenceChange(Preference preference, Object o) {
}
preference.setSummary(getString(R.string.sync_duration_minutes_summary, durationMinutes));
break;
case Constants.PREF_SLEEP_INTERVAL_MINUTES:
String intervalMinutes = o.toString();
if (TextUtils.isEmpty(intervalMinutes)) {
return false;
}
if (Integer.parseInt(intervalMinutes) <= 0) {
return false;
}
preference.setSummary(getString(R.string.sync_duration_minutes_summary, intervalMinutes));
break;
}
mPendingRunConditions = true;
return true;
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ private PowerSource() { }
public static final String PREF_RUN_IN_FLIGHT_MODE = "run_in_flight_mode";
public static final String PREF_RUN_ON_TIME_SCHEDULE = "run_on_time_schedule";
public static final String PREF_SYNC_DURATION_MINUTES = "sync_duration_minutes";
public static final String PREF_SLEEP_INTERVAL_MINUTES = "sleep_interval_minutes";

// Preferences - User Interface
public static final String PREF_APP_THEME = "app_theme";
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public RunConditionMonitor(Context context,
*/
if (lastSyncTimeSinceBootMillisecs > elapsedRealtime) {
SharedPreferences.Editor editor = mPreferences.edit();
editor.putLong(Constants.PREF_LAST_RUN_TIME, -Constants.WAIT_FOR_NEXT_SYNC_DELAY_SECS * 1000);
editor.putLong(Constants.PREF_LAST_RUN_TIME, -Integer.parseInt(mPreferences.getString(Constants.PREF_SLEEP_INTERVAL_MINUTES,"60")) * 60 * 1000);
editor.apply();
lastSyncTimeSinceBootMillisecs = 0;
}
Expand All @@ -206,7 +206,7 @@ public RunConditionMonitor(Context context,
* mTimeConditionMatch is set to true during updateShouldRunDecision().
* Thus the false case cannot be triggered if the delay for scheduleSyncTriggerServiceJob would be negative
*/
Constants.WAIT_FOR_NEXT_SYNC_DELAY_SECS - elapsedSecondsSinceLastSync,
(Integer.parseInt(mPreferences.getString(Constants.PREF_SLEEP_INTERVAL_MINUTES,"60")) * 60) - elapsedSecondsSinceLastSync,
!mTimeConditionMatch
);
}
Expand Down Expand Up @@ -281,7 +281,7 @@ public void onReceive(Context context, Intent intent) {
JobUtils.cancelAllScheduledJobs(context);
JobUtils.scheduleSyncTriggerServiceJob(
context,
Constants.WAIT_FOR_NEXT_SYNC_DELAY_SECS,
Integer.parseInt(mPreferences.getString(Constants.PREF_SLEEP_INTERVAL_MINUTES,"60")) * 60,
true
);
return;
Expand Down Expand Up @@ -313,9 +313,9 @@ public void onReceive(Context context, Intent intent) {
* corrected immediately
*/
long lastRunTimeMillis = mPreferences.getLong(Constants.PREF_LAST_RUN_TIME, 0);
if (lastDeterminedShouldRun && SystemClock.elapsedRealtime() - lastRunTimeMillis > Constants.WAIT_FOR_NEXT_SYNC_DELAY_SECS * 1000) {
if (lastDeterminedShouldRun && SystemClock.elapsedRealtime() - lastRunTimeMillis > Integer.parseInt(mPreferences.getString(Constants.PREF_SLEEP_INTERVAL_MINUTES,"60")) * 60 * 1000) {
SharedPreferences.Editor editor = mPreferences.edit();
editor.putLong(Constants.PREF_LAST_RUN_TIME, SystemClock.elapsedRealtime() - Constants.WAIT_FOR_NEXT_SYNC_DELAY_SECS * 1000 + 60*1000);
editor.putLong(Constants.PREF_LAST_RUN_TIME, SystemClock.elapsedRealtime() - Integer.parseInt(mPreferences.getString(Constants.PREF_SLEEP_INTERVAL_MINUTES,"60")) * 60 * 1000 + 60*1000);
editor.apply();
}
}
Expand All @@ -341,7 +341,7 @@ public void onReceive(Context context, Intent intent) {
JobUtils.cancelAllScheduledJobs(context);
JobUtils.scheduleSyncTriggerServiceJob(
context,
Constants.WAIT_FOR_NEXT_SYNC_DELAY_SECS,
Integer.parseInt(mPreferences.getString(Constants.PREF_SLEEP_INTERVAL_MINUTES,"60")) * 60,
true
);
} else {
Expand Down Expand Up @@ -572,7 +572,7 @@ private boolean decideShouldRun() {

// PREF_RUN_ON_TIME_SCHEDULE
// set mTimeConditionMatch to true if the last run was more than WAIT_FOR_NEXT_SYNC_DELAY_SECS ago
if (SystemClock.elapsedRealtime() - mPreferences.getLong(Constants.PREF_LAST_RUN_TIME,0) > Constants.WAIT_FOR_NEXT_SYNC_DELAY_SECS * 1000)
if (SystemClock.elapsedRealtime() - mPreferences.getLong(Constants.PREF_LAST_RUN_TIME,0) > Integer.parseInt(mPreferences.getString(Constants.PREF_SLEEP_INTERVAL_MINUTES,"60")) * 60 * 1000)
mTimeConditionMatch = true;
if (prefRunOnTimeSchedule && !mTimeConditionMatch) {
// Currently, we aren't within a "SyncthingNative should run" time frame.
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,10 +530,11 @@
<string name="run_in_flight_mode_summary">Enabling this option will cause Syncthing to run even when you\'re offline. Enable if your device has problems detecting manual Wi-Fi connections during flight mode.</string>

<string name="run_on_time_schedule_title">Run according to time schedule</string>
<string name="run_on_time_schedule_summary">Enabling this option will attempt to sync for a configured duration if run conditions are fulfilled and the last sync was more than 1 hour ago. This can save a lot of battery but requires sync partners to be online. Please note: This may leave incomplete temporary files behind until the next scheduled sync takes place.</string>
<string name="run_on_time_schedule_summary">Enabling this option will attempt to sync for a configured duration if run conditions are fulfilled and if some specified interval period has elapsed since the last sync. This can save a lot of battery but requires sync partners to be online. Please note: This may leave incomplete temporary files behind until the next scheduled sync takes place.</string>

<string name="sync_duration_minutes_title">Duration of the sync cycle</string>
<string name="sync_duration_minutes_summary">%1$s minutes</string>
<string name="sleep_interval_minutes_title">Duration of the sync pause interval</string>

<!-- Preferences - Behaviour -->

Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/xml/app_settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@
android:maxLength="9"
android:defaultValue="5" />

<EditTextPreference
android:key="sleep_interval_minutes"
android:title="@string/sleep_interval_minutes_title"
android:summary="@string/sync_duration_minutes_summary"
android:singleLineTitle="false"
android:inputType="number"
android:maxLength="1440"
android:defaultValue="60" />

</PreferenceScreen>

<PreferenceScreen
Expand Down