From a68d3215a814cebb8bac28795ea2ad508fc03684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 13 Jan 2025 13:17:41 +0000
Subject: [PATCH] Fix overwriting device in activity details

---
 .../activities/ActivitySummariesActivity.java  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
index 4acc2a769..9cd37f39b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummariesActivity.java
@@ -27,25 +27,24 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Bundle;
-import android.util.SparseBooleanArray;
 import android.util.TypedValue;
 import android.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.AbsListView;
 import android.widget.DatePicker;
-import android.widget.ListView;
 import android.widget.Toast;
 
 import androidx.core.content.FileProvider;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -72,6 +71,8 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
 
 
 public class ActivitySummariesActivity extends AbstractListActivity<BaseActivitySummary> {
+    private static final Logger LOG = LoggerFactory.getLogger(ActivitySummariesActivity.class);
+
     static final int ACTIVITY_FILTER = 1;
     static final int ACTIVITY_DETAIL = 11;
     HashMap<String, ActivityKind> activityKindMap = new HashMap<>(0);
@@ -93,7 +94,13 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
             switch (Objects.requireNonNull(action)) {
                 case GBDevice.ACTION_DEVICE_CHANGED:
                     GBDevice device = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
-                    mGBDevice = device;
+                    if (device == null) {
+                        LOG.error("Got device changed without device");
+                        return;
+                    }
+                    if (!device.equals(mGBDevice)) {
+                        return;
+                    }
                     if (device.isBusy()) {
                         swipeLayout.setRefreshing(true);
                     } else {
@@ -107,7 +114,6 @@ public class ActivitySummariesActivity extends AbstractListActivity<BaseActivity
             }
         }
     };
-    private int subtrackDashboard = 0;
 
     public static int getBackgroundColor(Context context) {
         TypedValue typedValue = new TypedValue();