Update NetBird to v0.54.2

This commit is contained in:
bg443
2025-08-15 18:00:24 +01:00
parent d8e81a4f4b
commit d5f7bf7df2
6 changed files with 19 additions and 10 deletions

View File

@@ -18,8 +18,8 @@ android {
applicationId = "dev.bg.jetbird"
minSdk = 24
targetSdk = 36
versionCode = 30
versionName = "1.4.2"
versionCode = 31
versionName = "1.4.3"
buildConfigField("String", "NETBIRD_COMMIT", getShortNetbirdCommit())
buildConfigField("String", "NETBIRD_VERSION", getNetbirdVersionFromCommit())
@@ -158,6 +158,12 @@ configurations.all {
exclude("com.google.android.gms") // Just in case
}
tasks.whenTaskAdded {
if (name.contains("ArtProfile")) {
enabled = false
}
}
fun getNetbirdCommit(): String {
val stdout = ByteArrayOutputStream()
exec {

View File

@@ -315,7 +315,9 @@ private fun PeersList(
}
PrimaryTabRow(
selectedTabIndex = tab,
modifier = Modifier.fillMaxWidth()
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp)
) {
Tab(
selected = tab == 0,

View File

@@ -0,0 +1 @@
- Update NetBird to v0.54.2

Submodule netbird updated: 3e6eede152...70db8751d7

View File

@@ -1,5 +1,5 @@
diff --git a/client/android/client.go b/client/android/client.go
index 3b8a5bd0..c0d51969 100644
index c0524656..23a66eb1 100644
--- a/client/android/client.go
+++ b/client/android/client.go
@@ -3,7 +3,9 @@
@@ -9,10 +9,10 @@ index 3b8a5bd0..c0d51969 100644
+ "bytes"
"context"
+ "io"
"slices"
"sync"
log "github.com/sirupsen/logrus"
@@ -151,14 +153,20 @@ func (c *Client) Stop() {
@@ -155,14 +157,20 @@ func (c *Client) Stop() {
// SetTraceLogLevel configure the logger to trace level
func (c *Client) SetTraceLogLevel() {
@@ -33,7 +33,7 @@ index 3b8a5bd0..c0d51969 100644
// PeersList return with the list of the PeerInfos
func (c *Client) PeersList() *PeerInfoArray {
@@ -166,10 +174,29 @@ func (c *Client) PeersList() *PeerInfoArray {
@@ -170,10 +178,29 @@ func (c *Client) PeersList() *PeerInfoArray {
peerInfos := make([]PeerInfo, len(fullStatus.Peers))
for n, p := range fullStatus.Peers {

View File

@@ -1,5 +1,5 @@
diff --git a/client/android/preferences.go b/client/android/preferences.go
index 2d5668d1..64235a41 100644
index 9a5d6bb2..1fb6357a 100644
--- a/client/android/preferences.go
+++ b/client/android/preferences.go
@@ -219,6 +219,10 @@ func (p *Preferences) SetBlockInbound(block bool) {
@@ -12,4 +12,4 @@ index 2d5668d1..64235a41 100644
+
// Commit writes out the changes to the config file
func (p *Preferences) Commit() error {
_, err := internal.UpdateOrCreateConfig(p.configInput)
_, err := profilemanager.UpdateOrCreateConfig(p.configInput)