Follow upstream (#1083)

* Update build-syncthing.py * Update NotificationHandler.java ref https://github.com/syncthing/syncthing-android/pull/2040/files
Catfriend1 · Feb 8, 2024 · 533f479 · 533f479
1 parent d11e35d
commit 533f479
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java b/app/src/main/java/com/nutomic/syncthingandroid/service/NotificationHandler.java
@@ -81,9 +81,9 @@ public NotificationHandler(Context context) {
             mInfoChannel = new NotificationChannel(
                     CHANNEL_INFO, mContext.getString(R.string.notifications_other_channel),
                     NotificationManager.IMPORTANCE_LOW);
-            mPersistentChannel.enableVibration(false);
-            mPersistentChannel.setSound(null, null);
-            mPersistentChannel.setShowBadge(true);
+            mInfoChannel.enableVibration(false);
+            mInfoChannel.setSound(null, null);
+            mInfoChannel.setShowBadge(true);
             mNotificationManager.createNotificationChannel(mInfoChannel);
         } else {
             mPersistentChannel = null;

diff --git a/syncthing/build-syncthing.py b/syncthing/build-syncthing.py
@@ -393,6 +393,12 @@ def install_ndk():
     })
 
     subprocess.check_call([go_bin, 'mod', 'download'], cwd=syncthing_dir)
+    subprocess.check_call(
+                              [go_bin, 'version'],
+                              env=environ, cwd=syncthing_dir)
+    subprocess.check_call(
+                              [go_bin, 'run', 'build.go', 'version'],
+                              env=environ, cwd=syncthing_dir)
     subprocess.check_call([
                               go_bin, 'run', 'build.go', '-goos', 'android',
                               '-goarch', target['goarch'],