Skip to content
This repository was archived by the owner on Dec 6, 2025. It is now read-only.

Commit e5b620f

Browse files
nel0xnel0x
committed
Merge upstream/main at 4b77f2b 
2 parents 79b5c0a + 4b77f2b commit e5b620f

58 files changed

Lines changed: 429 additions & 419 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ syncthing/pkg/sumdb/
4545
ext/
4646

4747
# files generated by the debug scripts
48-
scripts/debug/*.xml
48+
scripts/debug/win/*.xml
4949

5050
# Unsupported translations
5151
app/src/main/play/listings/nb

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ jobs:
2828
git submodule foreach 'git fetch --unshallow || true'
2929
git submodule foreach 'git fetch --tags'
3030
31-
- name: Setup Java 21
31+
- name: Setup Java
3232
uses: actions/setup-java@v4
3333
with:
3434
distribution: 'temurin'
3535
java-version: '21'
3636

37-
- name: Setup Go 1.24.1
37+
- name: Setup Go
3838
uses: actions/setup-go@v5
3939
with:
40-
go-version: '1.24.1'
40+
go-version: '1.25.0'
4141
cache: true
4242
cache-dependency-path: syncthing/src/github.com/syncthing/syncthing/go.sum
4343

‎.github/workflows/image-builder-template.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
submodules: true
2828
fetch-depth: 0
2929

30-
- uses: docker/setup-buildx-action@v2
30+
- uses: docker/setup-buildx-action@v3
3131

3232
- uses: docker/login-action@v3
3333
if: ${{ inputs.push }}
@@ -36,7 +36,7 @@ jobs:
3636
username: nel0x
3737
password: ${{ secrets.GHCR_TOKEN }}
3838

39-
- uses: docker/build-push-action@v4
39+
- uses: docker/build-push-action@v5
4040
with:
4141
context: .
4242
file: ./docker/Dockerfile

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ syncthing/pkg/sumdb/
4545
ext/
4646

4747
# files generated by the debug scripts
48-
scripts/debug/*.xml
48+
scripts/debug/win/*.xml
4949

5050
# Unsupported translations
5151
app/src/main/play/listings/nb

‎app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
<!--
4444
Apps can listen to our notifications about sync progress by subscribing to ACTION_NOTIFY_FOLDER_SYNC_COMPLETE,
4545
see RestApi for more details. To do so, they must declare the following in their app manifest.
46-
<uses-permission android:name="com.github.catfriend1.syncthingandroid.debug.permission.RECEIVE_SYNC_STATUS"/>
47-
<uses-permission android:name="com.github.catfriend1.syncthingandroid.permission.RECEIVE_SYNC_STATUS"/>
46+
<uses-permission android:name="${applicationId}.permission.RECEIVE_SYNC_STATUS"/>
4847
-->
4948
<permission android:name="${applicationId}.permission.RECEIVE_SYNC_STATUS"
5049
android:label="RECEIVE_SYNC_STATUS"
@@ -98,7 +97,7 @@
9897
<action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
9998
</intent-filter>
10099
<intent-filter>
101-
<action android:name="com.github.catfriend1.syncthingandroid.MainActivity.EXIT" />
100+
<action android:name="${applicationId}.MainActivity.EXIT" />
102101
</intent-filter>
103102
</activity>
104103
<activity
@@ -221,9 +220,9 @@
221220
android:exported="true"
222221
tools:ignore="ExportedReceiver">
223222
<intent-filter>
224-
<action android:name="com.github.catfriend1.syncthingandroid.action.FOLLOW" />
225-
<action android:name="com.github.catfriend1.syncthingandroid.action.START" />
226-
<action android:name="com.github.catfriend1.syncthingandroid.action.STOP" />
223+
<action android:name="${applicationId}.action.FOLLOW" />
224+
<action android:name="${applicationId}.action.START" />
225+
<action android:name="${applicationId}.action.STOP" />
227226
</intent-filter>
228227
</receiver>
229228
<activity android:name=".activities.FolderTypeDialogActivity"

‎app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@
7373
public class DeviceActivity extends SyncthingActivity {
7474

7575
public static final String EXTRA_NOTIFICATION_ID =
76-
"com.github.catfriend1.syncthingandroid.activities.DeviceActivity.NOTIFICATION_ID";
76+
".activities.DeviceActivity.NOTIFICATION_ID";
7777
public static final String EXTRA_DEVICE_ID =
78-
"com.github.catfriend1.syncthingandroid.activities.DeviceActivity.DEVICE_ID";
78+
".activities.DeviceActivity.DEVICE_ID";
7979
public static final String EXTRA_DEVICE_NAME =
80-
"com.github.catfriend1.syncthingandroid.activities.DeviceActivity.DEVICE_NAME";
80+
".activities.DeviceActivity.DEVICE_NAME";
8181
public static final String EXTRA_IS_CREATE =
82-
"com.github.catfriend1.syncthingandroid.activities.DeviceActivity.IS_CREATE";
82+
".activities.DeviceActivity.IS_CREATE";
8383

8484
private static final String TAG = "DeviceActivity";
8585
private static final String IS_SHOWING_DISCARD_DIALOG = "DISCARD_FOLDER_DIALOG_STATE";

‎app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,20 @@
7474
*/
7575
public class FolderActivity extends SyncthingActivity {
7676
public static final String EXTRA_DEVICE_ID =
77-
"com.github.catfriend1.syncthingandroid.activities.FolderActivity.DEVICE_ID";
77+
".activities.FolderActivity.DEVICE_ID";
7878

7979
public static final String EXTRA_FOLDER_ID =
80-
"com.github.catfriend1.syncthingandroid.activities.FolderActivity.FOLDER_ID";
80+
".activities.FolderActivity.FOLDER_ID";
8181
public static final String EXTRA_FOLDER_LABEL =
82-
"com.github.catfriend1.syncthingandroid.activities.FolderActivity.FOLDER_LABEL";
82+
".activities.FolderActivity.FOLDER_LABEL";
8383
public static final String EXTRA_IS_CREATE =
84-
"com.github.catfriend1.syncthingandroid.activities.FolderActivity.IS_CREATE";
84+
".activities.FolderActivity.IS_CREATE";
8585
public static final String EXTRA_NOTIFICATION_ID =
86-
"com.github.catfriend1.syncthingandroid.activities.FolderActivity.NOTIFICATION_ID";
86+
".activities.FolderActivity.NOTIFICATION_ID";
8787
public static final String EXTRA_RECEIVE_ENCRYPTED =
88-
"com.github.catfriend1.syncthingandroid.activities.FolderActivity.RECEIVE_ENCRYPTED";
88+
".activities.FolderActivity.RECEIVE_ENCRYPTED";
8989
public static final String EXTRA_REMOTE_ENCRYPTED =
90-
"com.github.catfriend1.syncthingandroid.activities.FolderActivity.REMOTE_ENCRYPTED";
90+
".activities.FolderActivity.REMOTE_ENCRYPTED";
9191

9292
private static final String TAG = "FolderActivity";
9393

‎app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ public class FolderPickerActivity extends SyncthingActivity
4949
private static final String TAG = "FolderPickerActivity";
5050

5151
private static final String EXTRA_INITIAL_DIRECTORY =
52-
"com.github.catfriend1.syncthingandroid.activities.FolderPickerActivity.INITIAL_DIRECTORY";
52+
".activities.FolderPickerActivity.INITIAL_DIRECTORY";
5353

5454
/**
5555
* If requested by {@link #createIntent}, we'll only use one root dir and enforce
5656
* the user stays within that. {@link #populateRoots} will respect this extra.
5757
* See issue #366.
5858
*/
5959
private static final String EXTRA_ROOT_DIRECTORY =
60-
"com.github.catfriend1.syncthingandroid.activities.FolderPickerActivity.ROOT_DIRECTORY";
60+
".activities.FolderPickerActivity.ROOT_DIRECTORY";
6161

6262
public static final String EXTRA_RESULT_DIRECTORY =
63-
"com.github.catfriend1.syncthingandroid.activities.FolderPickerActivity.RESULT_DIRECTORY";
63+
".activities.FolderPickerActivity.RESULT_DIRECTORY";
6464

6565
public static final int DIRECTORY_REQUEST_CODE = 234;
6666

‎app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
public class FolderTypeDialogActivity extends ThemedAppCompatActivity {
2020

21-
public static final String EXTRA_FOLDER_TYPE = "com.github.catfriend1.syncthingandroid.activities.FolderTypeDialogActivity.FOLDER_TYPE";
22-
public static final String EXTRA_RESULT_FOLDER_TYPE = "com.github.catfriend1.syncthingandroid.activities.FolderTypeDialogActivity.EXTRA_RESULT_FOLDER_TYPE";
21+
public static final String EXTRA_FOLDER_TYPE = ".activities.FolderTypeDialogActivity.FOLDER_TYPE";
22+
public static final String EXTRA_RESULT_FOLDER_TYPE = ".activities.FolderTypeDialogActivity.EXTRA_RESULT_FOLDER_TYPE";
2323

2424
private String selectedType;
2525

‎app/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ private String getAndroidLog() {
269269
logline.contains("W/Looper") ||
270270
logline.contains("/libEGL") ||
271271
logline.contains("/libMiGL") ||
272+
logline.contains("E/libc") ||
272273
logline.contains("W/libc") ||
273-
logline.contains("W/libsyncthingnat") ||
274274
logline.contains("/MessageMonitor") ||
275275
logline.contains("/MIUI") ||
276276
logline.contains("/MiInputConsumer") ||

0 commit comments

Comments
 (0)