From 065f8cdaa7d397dffbc8ba82946d2bc4a9c8b66f Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Tue, 9 Apr 2024 10:17:26 +0200
Subject: [PATCH] Fix DeviceService not starting when the dashboard is the
 initial screen

---
 .../freeyourgadget/gadgetbridge/activities/ControlCenterv2.java | 2 ++
 .../freeyourgadget/gadgetbridge/activities/DevicesFragment.java | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
index 1296e2583..5946cfbc9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
@@ -294,6 +294,8 @@ public class ControlCenterv2 extends AppCompatActivity
                 GB.toast(this, getString(R.string.error_showing_changelog), Toast.LENGTH_LONG, GB.ERROR);
             }
         }
+
+        GBApplication.deviceService().requestDeviceInfo();
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java
index 102eee042..b91cc658f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DevicesFragment.java
@@ -178,8 +178,6 @@ public class DevicesFragment extends Fragment {
 
         if (GB.isBluetoothEnabled() && deviceList.isEmpty() && Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             startActivity(new Intent(getActivity(), DiscoveryActivityV2.class));
-        } else {
-            GBApplication.deviceService().requestDeviceInfo();
         }
 
         return currentView;