From 796fb3b4cd10396381b875a960f672b673724a34 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Tue, 19 Apr 2022 09:08:10 -0500
Subject: [PATCH] Refactor Device#equals method

---
 .../org/whispersystems/textsecuregcm/storage/Device.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
index 4b6018a41..36fe2bfe4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
@@ -253,10 +253,7 @@ public class Device {
 
   @Override
   public boolean equals(Object other) {
-    if (other == null || !(other instanceof Device)) return false;
-
-    Device that = (Device)other;
-    return this.id == that.id;
+    return (other instanceof Device that) && this.id == that.id;
   }
 
   @Override