From 78c720c66340106694d0cb4993a12cccdf882fc5 Mon Sep 17 00:00:00 2001
From: isha382 <isha.chaudhary@itinker.io>
Date: Thu, 17 Oct 2024 11:37:10 +0530
Subject: [PATCH] fixed automode bug in web controller

---
 .../java/org/openbot/autopilot/AutopilotFragment.java     | 8 +++-----
 .../java/org/openbot/objectNav/ObjectNavFragment.java     | 6 ++++--
 .../src/main/java/org/openbot/robot/FreeRoamFragment.java | 3 ---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java b/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
index 5e050def8..bb4d3c15b 100644
--- a/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
+++ b/android/robot/src/main/java/org/openbot/autopilot/AutopilotFragment.java
@@ -155,7 +155,6 @@ public void onNothingSelected(AdapterView<?> parent) {
 
         setSpeedMode(Enums.SpeedMode.getByID(preferencesManager.getSpeedMode()));
         setControlMode(Enums.ControlMode.getByID(preferencesManager.getControlMode()));
-        System.out.println("drive mode--->" + preferencesManager.getDriveMode());
         setDriveMode(Enums.DriveMode.getByID(preferencesManager.getDriveMode()));
 
         binding.controllerContainer.controlMode.setOnClickListener(
@@ -390,6 +389,9 @@ private void setNetworkEnabled(boolean b) {
             if (Enums.DriveMode.getByID(preferencesManager.getDriveMode()) == Enums.DriveMode.DUAL && Enums.ControlMode.getByID(preferencesManager.getControlMode()) == Enums.ControlMode.PHONE) {
                 binding.controllerContainer.driveMode.setAlpha(0.5f);
                 binding.controllerContainer.driveMode.setEnabled(false);
+            } else if (Enums.DriveMode.getByID(preferencesManager.getDriveMode()) == Enums.DriveMode.GAME && Enums.ControlMode.getByID(preferencesManager.getControlMode()) == Enums.ControlMode.WEBSERVER) {
+                binding.controllerContainer.driveMode.setAlpha(0.5f);
+                binding.controllerContainer.driveMode.setEnabled(false);
             }
         }
 
@@ -463,12 +465,10 @@ protected Model getModel() {
 
     private void connectWebController() {
         phoneController.connectWebServer();
-        Enums.DriveMode oldDriveMode = currentDriveMode;
         // Currently only dual drive mode supported
         setDriveMode(Enums.DriveMode.GAME);
         binding.controllerContainer.driveMode.setAlpha(0.5f);
         binding.controllerContainer.driveMode.setEnabled(false);
-        preferencesManager.setDriveMode(oldDriveMode.getValue());
     }
 
     protected void setModel(Model model) {
@@ -579,12 +579,10 @@ protected void setDriveMode(Enums.DriveMode driveMode) {
 
     private void connectPhoneController() {
         phoneController.connect(requireContext());
-        Enums.DriveMode oldDriveMode = currentDriveMode;
         // Currently only dual drive mode supported
         setDriveMode(Enums.DriveMode.DUAL);
         binding.controllerContainer.driveMode.setAlpha(0.5f);
         binding.controllerContainer.driveMode.setEnabled(false);
-        preferencesManager.setDriveMode(oldDriveMode.getValue());
     }
 
     private void disconnectPhoneController() {
diff --git a/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java b/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
index 6a533aeaf..e8a5918f4 100644
--- a/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
+++ b/android/robot/src/main/java/org/openbot/objectNav/ObjectNavFragment.java
@@ -428,6 +428,10 @@ private void setNetworkEnabled(boolean b) {
         binding.controllerContainer.driveMode.setAlpha(0.5f);
         binding.controllerContainer.driveMode.setEnabled(false);
       }
+     else if (Enums.DriveMode.getByID(preferencesManager.getDriveMode()) == Enums.DriveMode.GAME && Enums.ControlMode.getByID(preferencesManager.getControlMode()) == Enums.ControlMode.WEBSERVER) {
+        binding.controllerContainer.driveMode.setAlpha(0.5f);
+        binding.controllerContainer.driveMode.setEnabled(false);
+      }
     }
 
     resetFpsUi();
@@ -667,12 +671,10 @@ private void connectPhoneController() {
 
   private void connectWebController() {
     phoneController.connectWebServer();
-    Enums.DriveMode oldDriveMode = currentDriveMode;
     // Currently only dual drive mode supported
     setDriveMode(Enums.DriveMode.GAME);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
     binding.controllerContainer.driveMode.setEnabled(false);
-    preferencesManager.setDriveMode(oldDriveMode.getValue());
   }
 
   private void disconnectPhoneController() {
diff --git a/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java b/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
index 4d413c83e..45b9a8ee9 100644
--- a/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
+++ b/android/robot/src/main/java/org/openbot/robot/FreeRoamFragment.java
@@ -262,7 +262,6 @@ protected void setDriveMode(DriveMode driveMode) {
 
   private void connectPhoneController() {
     phoneController.connect(requireContext());
-    DriveMode oldDriveMode = currentDriveMode;
     // Currently only dual drive mode supported
     setDriveMode(DriveMode.DUAL);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
@@ -271,12 +270,10 @@ private void connectPhoneController() {
 
   private void connectWebController() {
     phoneController.connectWebServer();
-    Enums.DriveMode oldDriveMode = currentDriveMode;
     // Currently only dual drive mode supported
     setDriveMode(Enums.DriveMode.GAME);
     binding.controllerContainer.driveMode.setAlpha(0.5f);
     binding.controllerContainer.driveMode.setEnabled(false);
-    preferencesManager.setDriveMode(oldDriveMode.getValue());
   }
 
   private void disconnectPhoneController() {