Skip to content
This repository has been archived by the owner on Dec 3, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into fix/material-switch-style-padding
Browse files Browse the repository at this point in the history
  • Loading branch information
Divinelink authored Sep 30, 2024
2 parents 96ac130 + 7e98855 commit 71f1a0d
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 40 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/release-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ jobs:
echo '${{ secrets.SIGNING_KEYSTORE_JKS_BASE64 }}' | base64 -d > "$SYNCTHING_RELEASE_STORE_FILE"
echo '${{ secrets.GOOGLE_PLAY_SECRETS_BASE64 }}' | base64 -d > "$SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE"
java -version
./gradlew --no-daemon buildNative lint assembleRelease bundleRelease publishReleaseBundle
# TODO: Readd publishReleaseBundle if google play works again, or
# remove everything related to publishing to google play.
./gradlew --no-daemon buildNative lint assembleRelease bundleRelease
rm "$SYNCTHING_RELEASE_STORE_FILE" "$SYNCTHING_RELEASE_PLAY_ACCOUNT_CONFIG_FILE"
echo '${{ secrets.GNUPG_SIGNING_KEY_BASE64 }}' | base64 -d | gpg --import
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ android {
applicationId = "com.nutomic.syncthingandroid"
minSdk = 21
targetSdk = 33
versionCode = 4391
versionName = "1.27.10"
versionCode = 4393
versionName = "1.27.12.1"
testApplicationId = "com.nutomic.syncthingandroid.test"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/play/release-notes/en-GB/default.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Update Syncthing to v1.27.10: https://github.com/syncthing/syncthing/releases/tag/v1.27.10
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.27.10
* Update Syncthing to v1.27.12: https://github.com/syncthing/syncthing/releases/tag/v1.27.12
* App changelog: https://github.com/syncthing/syncthing-android/releases/tag/1.27.12

Still no releases on google play, see https://github.com/syncthing/syncthing-android/issues/2064
64 changes: 32 additions & 32 deletions app/src/main/res/values-ru/strings.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
<string name="state_error">错误</string>
<string name="state_unknown">未知</string>
<string name="state_paused">已暂停</string>
<string name="status_outofsync">不同步</string>
<string name="status_outofsync">未同步</string>
<!--Format string for folder size, eg "500 MiB / 1 GiB"-->
<string name="folder_size_format">%1$s / %2$s</string>
<string name="appconfig_receiver_background_enabled">启用后台运行时,不支持停止 Syncthing。</string>
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM eclipse-temurin:11-jdk-jammy

ENV GO_VERSION 1.22.1
ENV GO_VERSION 1.22.7

# Can be found scrolling down on this page:
# https://developer.android.com/studio/index.html#command-tools
Expand Down
2 changes: 1 addition & 1 deletion syncthing/src/github.com/syncthing/syncthing
Submodule syncthing updated 87 files
+3 −0 AUTHORS
+1 −1 cmd/stcompdirs/main.go
+1 −1 cmd/stcrashreceiver/main.go
+1 −2 cmd/stcrashreceiver/util.go
+1 −1 cmd/stwatchfile/main.go
+2 −2 cmd/syncthing/cli/main.go
+1 −2 cmd/syncthing/crash_reporting.go
+0 −5 cmd/syncthing/main.go
+0 −16 cmd/syncthing/monitor.go
+0 −0 cmd/ursrv/serve/static/bootstrap/css/bootstrap-theme.min.css
+0 −0 cmd/ursrv/serve/static/bootstrap/js/bootstrap.min.js
+ cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.eot
+0 −0 cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.svg
+ cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.ttf
+ cmd/ursrv/serve/static/fonts/glyphicons-halflings-regular.woff
+23 −21 go.mod
+54 −46 go.sum
+11 −0 gui/default/assets/lang/lang-ca.json
+3 −3 gui/default/assets/lang/lang-cs.json
+2 −1 gui/default/assets/lang/lang-da.json
+1 −1 gui/default/assets/lang/lang-es.json
+555 −0 gui/default/assets/lang/lang-ga.json
+310 −3 gui/default/assets/lang/lang-gl.json
+1 −1 gui/default/assets/lang/lang-ru.json
+237 −237 gui/default/assets/lang/lang-zh-CN.json
+1 −1 gui/default/assets/lang/lang-zh-TW.json
+1 −1 gui/default/assets/lang/prettyprint.js
+1 −1 gui/default/assets/lang/valid-langs.js
+1 −3 gui/default/syncthing/core/aboutModalView.html
+0 −0 gui/default/syncthing/core/syncthingController.js
+0 −0 gui/default/vendor/bootstrap/config.json
+0 −0 gui/default/vendor/bootstrap/css/bootstrap-theme.css
+0 −0 gui/default/vendor/bootstrap/css/bootstrap.css
+0 −0 gui/default/vendor/bootstrap/js/bootstrap.js
+0 −1 lib/build/build.go
+1 −1 lib/config/folderconfiguration.go
+1 −1 lib/db/lowlevel.go
+1 −1 lib/fs/basicfs.go
+3 −1 lib/fs/basicfs_watch.go
+2 −2 lib/fs/basicfs_watch_eventtypes_darwin.go
+2 −2 lib/fs/basicfs_watch_eventtypes_other.go
+2 −2 lib/fs/basicfs_watch_unsupported.go
+1 −1 lib/fs/tempname.go
+1 −1 lib/ignore/ignore.go
+1 −1 lib/ignore/ignoreresult/ignoreresult_foldcase.go
+1 −1 lib/ignore/ignoreresult/ignoreresult_nofoldcase.go
+2 −2 lib/locations/locations.go
+2 −2 lib/model/folder_sendrecv.go
+1 −1 lib/model/folder_summary.go
+102 −0 lib/model/mocks/model.go
+5 −3 lib/model/model.go
+1 −1 lib/model/model_test.go
+2 −2 lib/model/progressemitter.go
+1 −1 lib/model/progressemitter_test.go
+3 −3 lib/model/sharedpullerstate.go
+16 −0 lib/osutil/lowprio_noop.go
+2 −2 lib/osutil/lowprio_unix.go
+1 −1 lib/protocol/bep_extensions.go
+1 −2 lib/protocol/deviceid.go
+1 −1 lib/protocol/encryption.go
+1 −1 lib/scanner/blocks.go
+1 −1 lib/scanner/blocks_test.go
+1 −1 lib/scanner/walk.go
+1 −1 lib/scanner/walk_test.go
+0 −157 lib/sha256/sha256.go
+1 −1 lib/signature/signature.go
+86 −0 lib/syncthing/internals.go
+4 −6 lib/syncthing/syncthing.go
+13 −3 lib/upgrade/upgrade_supported.go
+2 −2 lib/upgrade/upgrade_unsupp.go
+1 −1 man/stdiscosrv.1
+1 −1 man/strelaysrv.1
+1 −1 man/syncthing-bep.7
+1 −1 man/syncthing-config.5
+1 −1 man/syncthing-device-ids.7
+1 −1 man/syncthing-event-api.7
+10 −2 man/syncthing-faq.7
+1 −1 man/syncthing-globaldisco.7
+1 −1 man/syncthing-localdisco.7
+1 −1 man/syncthing-networking.7
+1 −1 man/syncthing-relay.7
+1 −1 man/syncthing-rest-api.7
+1 −1 man/syncthing-security.7
+1 −1 man/syncthing-stignore.5
+1 −1 man/syncthing-versioning.7
+1 −6 man/syncthing.1
+1 −1 test/util.go

0 comments on commit 71f1a0d

Please sign in to comment.