From 4a83dbf4090b9adcffebd93c44bae4305164b11a Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Wed, 23 Nov 2022 19:24:13 +0100 Subject: [PATCH 1/3] Fix default for global run condition setting (fixes #1852) (#1863) --- .../nutomic/syncthingandroid/service/RunConditionMonitor.java | 2 +- syncthing/src/github.com/syncthing/syncthing | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java b/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java index 0a6b286f..de170f02 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/RunConditionMonitor.java @@ -169,7 +169,7 @@ public class RunConditionMonitor { */ private RunConditionCheckResult decideShouldRun() { // Get run conditions preferences. - boolean prefRunConditions= mPreferences.getBoolean(Constants.PREF_RUN_CONDITIONS, false); + boolean prefRunConditions= mPreferences.getBoolean(Constants.PREF_RUN_CONDITIONS, true); boolean prefRunOnMobileData= mPreferences.getBoolean(Constants.PREF_RUN_ON_MOBILE_DATA, false); boolean prefRunOnWifi= mPreferences.getBoolean(Constants.PREF_RUN_ON_WIFI, true); boolean prefRunOnMeteredWifi= mPreferences.getBoolean(Constants.PREF_RUN_ON_METERED_WIFI, false); diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index a523fef7..15c0afec 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit a523fef78e617956f62684e28a4c73372a388c91 +Subproject commit 15c0afec055b935870b05af4483a0598d2e84dbb From f1428df29850abbd30690a12b932ca8c953ab01c Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 24 Nov 2022 20:36:12 +0100 Subject: [PATCH 2/3] Updated Syncthing to v1.22.2-rc.3 --- syncthing/src/github.com/syncthing/syncthing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncthing/src/github.com/syncthing/syncthing b/syncthing/src/github.com/syncthing/syncthing index 15c0afec..663106ef 160000 --- a/syncthing/src/github.com/syncthing/syncthing +++ b/syncthing/src/github.com/syncthing/syncthing @@ -1 +1 @@ -Subproject commit 15c0afec055b935870b05af4483a0598d2e84dbb +Subproject commit 663106ef6e3ee3c3a8d9231137aeccf1ddad6e1b From be5f6476f7e08f27ca24fbff751898daa52b22f6 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 24 Nov 2022 20:34:04 +0100 Subject: [PATCH 3/3] Bumped version to 1.22.2-rc.3 --- app/build.gradle | 4 ++-- app/src/main/play/release-notes/en-GB/default.txt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cc90058f..065efc59 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,8 +42,8 @@ android { applicationId "com.nutomic.syncthingandroid" minSdkVersion 16 targetSdkVersion 30 - versionCode 4326 - versionName "1.22.2-rc.1" + versionCode 4327 + versionName "1.22.2-rc.3" testApplicationId 'com.nutomic.syncthingandroid.test' testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/app/src/main/play/release-notes/en-GB/default.txt b/app/src/main/play/release-notes/en-GB/default.txt index d2a03451..7042ffe2 100644 --- a/app/src/main/play/release-notes/en-GB/default.txt +++ b/app/src/main/play/release-notes/en-GB/default.txt @@ -1 +1,2 @@ -* Update Syncthing to v1.22.2-rc.1 ( https://github.com/syncthing/syncthing/releases/tag/v1.22.2-rc.1 ) +* Update Syncthing to v1.22.2-rc.3 ( https://github.com/syncthing/syncthing/releases/tag/v1.22.2-rc.3 ) +* Mobile data usage while run on mobile data is disabled ( https://github.com/syncthing/syncthing-android/issues/1852 )