Add Android debug bundle support with Troubleshoot UI

app/src/main/java/io/netbird/client/MainActivity.java

@@ -413,6 +413,14 @@ public void deselectRoute(String route) throws Exception {
         mBinder.deselectRoute(route);
     }
 
+    @Override
+    public String debugBundle(boolean anonymize) throws Exception {
+        if (mBinder == null) {
+            throw new Exception("VPN service not connected");
+        }
+        return mBinder.debugBundle(anonymize);
+    }
+
     @Override
     public void addRouteChangeListener(RouteChangeListener listener) {
         if (mBinder == null) {

app/src/main/java/io/netbird/client/ServiceAccessor.java

@@ -17,4 +17,6 @@ public interface ServiceAccessor {
 
     void addRouteChangeListener(RouteChangeListener listener);
     void removeRouteChangeListener(RouteChangeListener listener);
+
+    String debugBundle(boolean anonymize) throws Exception;
 }

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

@@ -1,6 +1,5 @@
 package io.netbird.client.ui.advanced;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -20,7 +19,6 @@
 import io.netbird.client.R;
 import io.netbird.client.databinding.ComponentSwitchBinding;
 import io.netbird.client.databinding.FragmentAdvancedBinding;
-import io.netbird.client.tool.Logcat;
 import io.netbird.client.tool.Preferences;
 import io.netbird.client.tool.ProfileManagerWrapper;
 
@@ -103,28 +101,7 @@ public View onCreateView(@NonNull LayoutInflater inflater,
             setPreSharedKey(presharedKey, inflater.getContext());
         });
 
-        // Enable trace logs
         Preferences preferences = new Preferences(inflater.getContext());
-        binding.switchTraceLog.setChecked(preferences.isTraceLogEnabled());
-
-        // Handle trace log switch toggle
-        binding.switchTraceLog.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            if (isChecked) {
-                preferences.enableTraceLog();
-            } else {
-                preferences.disableTraceLog();
-            }
-        });
-
-        // Make parent layout clickable to toggle switch (for TV remote)
-        binding.traceLogLayout.setOnClickListener(v -> {
-            binding.switchTraceLog.toggle();
-        });
-
-        // Handle "Share Logs" button click
-        binding.buttonShareLogs.setOnClickListener(v -> {
-            shareLog();
-        });
 
         // Rosenpass settings
         try {
@@ -362,17 +339,4 @@ private boolean hasPreSharedKey(Context context) {
         }
     }
 
-    private void shareLog() {
-        Activity activity = getActivity();
-        if (activity == null) {
-            return;
-        }
-
-        try {
-            Logcat logcat = new Logcat(activity);
-            logcat.dump();
-        } catch (Exception e) {
-            Log.e(LOGTAG, "failed to dump log", e);
-        }
-    }
 }

app/src/main/java/io/netbird/client/ui/troubleshoot/TroubleshootFragment.java

@@ -0,0 +1,90 @@
+package io.netbird.client.ui.troubleshoot;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import io.netbird.client.R;
+import io.netbird.client.ServiceAccessor;
+import io.netbird.client.databinding.FragmentTroubleshootBinding;
+import io.netbird.client.tool.Preferences;
+
+public class TroubleshootFragment extends Fragment {
+
+    private static final String LOGTAG = "TroubleshootFragment";
+    private FragmentTroubleshootBinding binding;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        binding = FragmentTroubleshootBinding.inflate(inflater, container, false);
+
+        Preferences preferences = new Preferences(inflater.getContext());
+        binding.switchTraceLog.setChecked(preferences.isTraceLogEnabled());
+
+        binding.switchTraceLog.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked) {
+                preferences.enableTraceLog();
+            } else {
+                preferences.disableTraceLog();
+            }
+        });
+
+        binding.traceLogLayout.setOnClickListener(v -> {
+            binding.switchTraceLog.toggle();
+        });
+
+        binding.anonymizeLayout.setOnClickListener(v -> {
+            binding.switchAnonymize.toggle();
+        });
+
+        binding.buttonDebugBundle.setOnClickListener(v -> {
+            generateDebugBundle();
+        });
+
+        return binding.getRoot();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        binding = null;
+    }
+
+    private void generateDebugBundle() {
+        Activity activity = getActivity();
+        if (activity == null || !(activity instanceof ServiceAccessor)) {
+            return;
+        }
+
+        boolean anonymize = binding.switchAnonymize.isChecked();
+        binding.buttonDebugBundle.setEnabled(false);
+        new Thread(() -> {
+            try {
+                String key = ((ServiceAccessor) activity).debugBundle(anonymize);
+                activity.runOnUiThread(() -> {
+                    binding.buttonDebugBundle.setEnabled(true);
+                    ClipboardManager clipboard = (ClipboardManager) activity.getSystemService(Context.CLIPBOARD_SERVICE);
+                    ClipData clip = ClipData.newPlainText("Debug bundle key", key);
+                    clipboard.setPrimaryClip(clip);
+                    Toast.makeText(activity, "Debug bundle key copied to clipboard", Toast.LENGTH_SHORT).show();
+                });
+            } catch (Exception e) {
+                Log.e(LOGTAG, "failed to create debug bundle", e);
+                activity.runOnUiThread(() -> {
+                    binding.buttonDebugBundle.setEnabled(true);
+                    Toast.makeText(activity, "Failed to create debug bundle: " + e.getMessage(), Toast.LENGTH_LONG).show();
+                });
+            }
+        }).start();
+    }
+}

app/src/main/res/drawable/ic_menu_about.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "info" outlined icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+</vector>

app/src/main/res/drawable/ic_menu_advanced.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "settings" outlined icon with hollow center -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73s-0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+</vector>

app/src/main/res/drawable/ic_menu_change_server.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "dns" outlined icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19,15v4H5v-4h14m2,-2H3v8h18v-8zM19,3v4H5V3h14m2,-2H3v8h18V1zM7,8.5c0.83,0 1.5,-0.67 1.5,-1.5S7.83,5.5 7,5.5 5.5,6.17 5.5,7 6.17,8.5 7,8.5zM7,18.5c0.83,0 1.5,-0.67 1.5,-1.5s-0.67,-1.5 -1.5,-1.5 -1.5,0.67 -1.5,1.5 0.67,1.5 1.5,1.5z" />
+</vector>

app/src/main/res/drawable/ic_menu_docs.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "help_outline" icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
+</vector>

app/src/main/res/drawable/ic_menu_troubleshoot.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <!-- Material Design "bug_report" outlined icon -->
+    <path
+        android:fillColor="#000000"
+        android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5s-0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8H4v2h2.09C6.04,10.33 6,10.66 6,11v1H4v2h2v1c0,0.34 0.04,0.67 0.09,1H4v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3H20v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1H20V8zM16,15c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4v-4c0,-2.21 1.79,-4 4,-4s4,1.79 4,4v4zM10,14h4v2h-4v-2zM10,10h4v2h-4v-2z" />
+</vector>

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

@@ -76,63 +76,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/preshared_key" />
 
-            <View
-                android:id="@+id/separator"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/separator"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/btn_save" />
-
-            <LinearLayout
-                android:id="@+id/trace_log_layout"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:background="@drawable/focus_highlight"
-                android:clickable="true"
-                android:focusable="true"
-                android:focusableInTouchMode="false"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:padding="12dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/separator">
-
-                <TextView
-                    android:id="@+id/switchLabel"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/advanced_tracelog"
-                    android:textColor="@color/nb_txt_light"
-                    android:textSize="15sp" />
-
-                <com.google.android.material.switchmaterial.SwitchMaterial
-                    android:id="@+id/switch_trace_log"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:focusable="false" />
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/button_share_logs"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/btn_bg_orange"
-                android:focusable="true"
-                android:focusableInTouchMode="false"
-                android:foreground="@drawable/focus_highlight"
-                android:text="@string/advanced_share_logs"
-                android:textAllCaps="false"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/trace_log_layout" />
-
             <View
                 android:id="@+id/separator_rosenpass"
                 android:layout_width="0dp"
@@ -141,7 +84,7 @@
                 android:background="@drawable/separator"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/button_share_logs" />
+                app:layout_constraintTop_toBottomOf="@id/btn_save" />
 
             <LinearLayout
                 android:id="@+id/layout_rosenpas"