android: remove Force-Relay switch (replaced by Connection-Mode picker)

Phase 3.7h finalisation. The standalone "Force relay connection" toggle
in Advanced Settings is removed because the new Connection-Mode picker
(landed earlier on this branch) supersedes it. Preferences key and
EnvVarPackager NB_FORCE_RELAY plumbing are removed too so the setting
no longer leaks into NetBird via env vars. Bumps netbird submodule to
include the matching ServerPushed-getter commits from the netbird repo.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: MichaelUray

app/src/main/java/io/netbird/client/ui/advanced/AdvancedFragment.java

@@ -17,12 +17,10 @@
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.fragment.app.Fragment;
 
 import io.netbird.client.R;
-import io.netbird.client.databinding.ComponentSwitchBinding;
 import io.netbird.client.databinding.FragmentAdvancedBinding;
 import io.netbird.client.tool.Preferences;
 import io.netbird.client.tool.ProfileManagerWrapper;
@@ -36,38 +34,6 @@ public class AdvancedFragment extends Fragment {
     private FragmentAdvancedBinding binding;
     private io.netbird.gomobile.android.Preferences goPreferences;
 
-    private void showReconnectionNeededWarningDialog() {
-        final View dialogView = getLayoutInflater().inflate(R.layout.dialog_simple_alert_message, null);
-        final AlertDialog alertDialog = new AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme)
-                .setView(dialogView)
-                .create();
-
-        ((TextView)dialogView.findViewById(R.id.txt_dialog)).setText(R.string.reconnectionNeededWarningMessage);
-        dialogView.findViewById(R.id.btn_ok_dialog).setOnClickListener(v -> alertDialog.dismiss());
-        alertDialog.show();
-    }
-
-    private void configureForceRelayConnectionSwitch(@NonNull ComponentSwitchBinding binding, @NonNull Preferences preferences) {
-        binding.switchTitle.setText(R.string.advanced_force_relay_conn);
-        binding.switchDescription.setText(R.string.advanced_force_relay_conn_desc);
-
-        binding.switchControl.setChecked(preferences.isConnectionForceRelayed());
-        binding.switchControl.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (isChecked) {
-                preferences.enableForcedRelayConnection();
-            } else {
-                preferences.disableForcedRelayConnection();
-            }
-
-            showReconnectionNeededWarningDialog();
-        });
-        
-        // Make parent layout clickable to toggle switch (for TV remote)
-        binding.getRoot().setOnClickListener(v -> {
-            binding.switchControl.toggle();
-        });
-    }
-
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
 
@@ -163,8 +129,6 @@ public View onCreateView(@NonNull LayoutInflater inflater,
             binding.switchRosenpassPermissive.toggle();
         });
 
-        configureForceRelayConnectionSwitch(binding.layoutForceRelayConnection, preferences);
-
         // Initialize engine config switches (your settings)
         initializeEngineConfigSwitches();
 

app/src/main/res/layout/fragment_advanced.xml

@@ -567,17 +567,6 @@
 
             </LinearLayout>
 
-            <include
-                android:id="@+id/layout_force_relay_connection"
-                layout="@layout/component_switch"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:orientation="vertical"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/layout_disable_firewall" />
-
             <LinearLayout
                 android:id="@+id/layout_theme"
                 android:layout_width="0dp"
@@ -586,7 +575,7 @@
                 android:orientation="vertical"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/layout_force_relay_connection">
+                app:layout_constraintTop_toBottomOf="@id/layout_disable_firewall">
 
                 <TextView
                     android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -117,8 +117,6 @@
     <string name="advanced_theme_dark">Dark</string>
     <string name="advanced_theme_light">Light</string>
     <string name="advanced_theme_desc">Choose the app appearance mode.</string>
-    <string name="advanced_force_relay_conn">Force relay connection</string>
-    <string name="advanced_force_relay_conn_desc">Forces usage of relay when connecting to peers</string>
     <string name="exclamation_mark">exclamation mark</string>
     <string name="reconnectionNeededWarningMessage">To apply the setting, you will need to reconnect.</string>
     <string name="change_server_setup_key_warning">Using setup keys for user devices is not recommended. SSO with MFA provides stronger security, proper user-device association, and periodic re-authentication.</string>

netbird

@@ -1,14 +1,9 @@
 package io.netbird.client.tool;
 
-import io.netbird.gomobile.android.Android;
 import io.netbird.gomobile.android.EnvList;
 
 public class EnvVarPackager {
     public static EnvList getEnvironmentVariables(Preferences preferences) {
-        var envList = new EnvList();
-
-        envList.put(Android.getEnvKeyNBForceRelay(), String.valueOf(preferences.isConnectionForceRelayed()));
-
-        return envList;
+        return new EnvList();
     }
 }

tool/src/main/java/io/netbird/client/tool/EnvVarPackager.java

@@ -7,8 +7,6 @@ public class Preferences {
 
     private final String keyTraceLog = "tracelog";
 
-    private final String keyForceRelayConnection = "isConnectionForceRelayed";
-
     private final SharedPreferences sharedPref;
 
     public Preferences(Context context) {
@@ -26,18 +24,6 @@ public void disableTraceLog() {
         sharedPref.edit().putBoolean(keyTraceLog, false).apply();
     }
 
-    public boolean isConnectionForceRelayed() {
-        return sharedPref.getBoolean(keyForceRelayConnection, true);
-    }
-
-    public void enableForcedRelayConnection() {
-        sharedPref.edit().putBoolean(keyForceRelayConnection, true).apply();
-    }
-
-    public void disableForcedRelayConnection() {
-        sharedPref.edit().putBoolean(keyForceRelayConnection, false).apply();
-    }
-
     public static String defaultServer() {
         return "https://api.netbird.io";
     }