From e201344ccd822a5a712d9e5e90df44ffa194dbf5 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie+github@signal.org>
Date: Thu, 24 Jan 2019 17:48:04 -0800
Subject: [PATCH] Fix for inactive auth problem

---
 .../textsecuregcm/auth/AccountAuthenticator.java            | 2 +-
 .../org/whispersystems/textsecuregcm/storage/Device.java    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java b/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java
index 95286960e..900f1aa9c 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/auth/AccountAuthenticator.java
@@ -66,7 +66,7 @@ public class AccountAuthenticator implements Authenticator<BasicCredentials, Acc
         return Optional.empty();
       }
 
-      if (!device.get().isMaster() && !device.get().isActive()) {
+      if (!device.get().isMaster() && device.get().isIdleInactive()) {
         return Optional.empty();
       }
 
diff --git a/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java b/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
index 04d0adff7..1abdb21aa 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/storage/Device.java
@@ -195,7 +195,11 @@ public class Device {
     boolean hasChannel = fetchesMessages || !Util.isEmpty(getApnId()) || !Util.isEmpty(getGcmId());
 
     return (id == MASTER_ID && hasChannel && signedPreKey != null) ||
-           (id != MASTER_ID && hasChannel && signedPreKey != null && lastSeen > (System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30)));
+           (id != MASTER_ID && hasChannel && signedPreKey != null && !isIdleInactive());
+  }
+
+  public boolean isIdleInactive() {
+    return id != MASTER_ID && lastSeen < (System.currentTimeMillis() - TimeUnit.DAYS.toMillis(30));
   }
 
   public boolean getFetchesMessages() {