From 7bbe71c3ac4b8d95cb6e5b764dd87d6ba8c9c271 Mon Sep 17 00:00:00 2001
From: Akshay Ubale <31108741+iakshayubale@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:55:01 +0200
Subject: [PATCH] [client] Refactor Android PeerInfo to use proper ConnStatus
 enum type (#5644)

* Simplify Android ConnStatus API with integer constants

Replace dual field PeerInfo design with unified integer based
ConnStatus field and exported gomobile friendly constants.

Changes:
> PeerInfo.ConnStatus: changed from string to int
> Export three constants: ConnStatusIdle, ConnStatusConnecting,ConnStatusConnected (mapped to peer.ConnStatus enum values)
> Updated PeersList() to convert peer enum directly to int

Benefits:
> Simpler API surface with single ConnStatus field
> Better gomobile compatibility for cross-platform usage
> Type-safe integer constants across language boundaries

* test: add All group to setupTestAccount fixture

The setupTestAccount() test helper was missing the required "All" group,
causing "failed to get group all: no group ALL found" errors during
test execution. Add the All group with all test peers to match the
expected account structure.

Fixes the failing account and types package tests when GetGroupAll()
is called in test scenarios.
---
 client/android/client.go                |  2 +-
 client/android/peer_notifier.go         | 11 ++++++++++-
 management/server/types/account_test.go |  6 ++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/client/android/client.go b/client/android/client.go
index 3fc571559..d35bf4279 100644
--- a/client/android/client.go
+++ b/client/android/client.go
@@ -205,7 +205,7 @@ func (c *Client) PeersList() *PeerInfoArray {
 		pi := PeerInfo{
 			p.IP,
 			p.FQDN,
-			p.ConnStatus.String(),
+			int(p.ConnStatus),
 			PeerRoutes{routes: maps.Keys(p.GetRoutes())},
 		}
 		peerInfos[n] = pi
diff --git a/client/android/peer_notifier.go b/client/android/peer_notifier.go
index b03947da1..4ec22f3ab 100644
--- a/client/android/peer_notifier.go
+++ b/client/android/peer_notifier.go
@@ -2,11 +2,20 @@
 
 package android
 
+import "github.com/netbirdio/netbird/client/internal/peer"
+
+// Connection status constants exported via gomobile.
+const (
+	ConnStatusIdle       = int(peer.StatusIdle)
+	ConnStatusConnecting = int(peer.StatusConnecting)
+	ConnStatusConnected  = int(peer.StatusConnected)
+)
+
 // PeerInfo describe information about the peers. It designed for the UI usage
 type PeerInfo struct {
 	IP         string
 	FQDN       string
-	ConnStatus string // Todo replace to enum
+	ConnStatus int
 	Routes     PeerRoutes
 }
 
diff --git a/management/server/types/account_test.go b/management/server/types/account_test.go
index af2896216..00ba29b7f 100644
--- a/management/server/types/account_test.go
+++ b/management/server/types/account_test.go
@@ -84,6 +84,12 @@ func setupTestAccount() *Account {
 			},
 		},
 		Groups: map[string]*Group{
+			"groupAll": {
+				ID:    "groupAll",
+				Name:  "All",
+				Peers: []string{"peer1", "peer2", "peer3", "peer11", "peer12", "peer21", "peer31", "peer32", "peer41", "peer51", "peer61"},
+				Issued: GroupIssuedAPI,
+			},
 			"group1": {
 				ID:    "group1",
 				Peers: []string{"peer11", "peer12"},