diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-06 21:23:49 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-06 21:23:49 +0200 |
| commit | 1e5c64a1f569ebe8a893cdff9a4d8957849220b3 (patch) | |
| tree | 75bbcb3a1d8d40895903fb38b2a3bee008367dc7 /src/main/java/eu/siacs/conversations/utils | |
| parent | 6582ac6e72a1f9bf55f2f6d8457114a6426c1062 (diff) | |
| parent | b88128241eb7deb6599e946dc009fdc5dfd32974 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 4ab748188..acc7f28c5 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -107,12 +107,10 @@ public class UIHelper { .get(Calendar.DAY_OF_YEAR); } - public static String lastseen(Context context, long time) { - if (time == 0) { - return context.getString(R.string.never_seen); - } + public static String lastseen(Context context, boolean active, long time) { long difference = (System.currentTimeMillis() - time) / 1000; - if (difference < 60) { + active = active && difference <= 300; + if (active || difference < 60) { return context.getString(R.string.last_seen_now); } else if (difference < 60 * 2) { return context.getString(R.string.last_seen_min); |