From 95ef8fd216d31aabd089649161ac699d06f3f8cd Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 23 Mar 2017 23:34:58 +0100 Subject: =?UTF-8?q?rework=20last=20activity=20logic=20to=20something=20tha?= =?UTF-8?q?t=20should=20work=20pretty=20well=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …in Conversations only enviroments --- src/main/java/de/pixart/messenger/utils/UIHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/utils/UIHelper.java') diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index 05d6c2706..68f9297e9 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -112,8 +112,9 @@ public class UIHelper { public static String lastseen(Context context, boolean active, long time) { long difference = (System.currentTimeMillis() - time) / 1000; - active = active && difference <= 300; - if (active || difference < 60) { + if (active) { + return context.getString(R.string.last_seen_now); + } else if (difference < 60) { return context.getString(R.string.last_seen_now); } else if (difference < 60 * 2) { return context.getString(R.string.last_seen_min); -- cgit v1.2.3