From e1deb7ae138a8821fd91cf85321b68c5a73675c7 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 14 Mar 2017 12:05:25 +0500 Subject: Implemented helper lookupPreference --- src/org/traccar/reports/ReportUtils.java | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'src/org/traccar/reports/ReportUtils.java') diff --git a/src/org/traccar/reports/ReportUtils.java b/src/org/traccar/reports/ReportUtils.java index 9614ecf71..ed97c6857 100644 --- a/src/org/traccar/reports/ReportUtils.java +++ b/src/org/traccar/reports/ReportUtils.java @@ -32,38 +32,15 @@ public final class ReportUtils { } public static String getDistanceUnit(long userId) { - String unit; - String userUnit = Context.getPermissionsManager().getUser(userId).getDistanceUnit(); - String serverUnit = Context.getPermissionsManager().getServer().getDistanceUnit(); - if (Context.getPermissionsManager().getServer().getForceSettings()) { - unit = serverUnit != null ? serverUnit : userUnit; - } else { - unit = userUnit != null ? userUnit : serverUnit; - } - return unit != null ? unit : "km"; + return (String) Context.getPermissionsManager().lookupPreference(userId, "distanceUnit", "km"); } public static String getSpeedUnit(long userId) { - String unit; - String userUnit = Context.getPermissionsManager().getUser(userId).getSpeedUnit(); - String serverUnit = Context.getPermissionsManager().getServer().getSpeedUnit(); - if (Context.getPermissionsManager().getServer().getForceSettings()) { - unit = serverUnit != null ? serverUnit : userUnit; - } else { - unit = userUnit != null ? userUnit : serverUnit; - } - return unit != null ? unit : "kn"; + return (String) Context.getPermissionsManager().lookupPreference(userId, "speedUnit", "kn"); } public static TimeZone getTimezone(long userId) { - String timezone; - String userTimezone = Context.getPermissionsManager().getUser(userId).getTimezone(); - String serverTimezone = Context.getPermissionsManager().getServer().getTimezone(); - if (Context.getPermissionsManager().getServer().getForceSettings()) { - timezone = serverTimezone != null ? serverTimezone : userTimezone; - } else { - timezone = userTimezone != null ? userTimezone : serverTimezone; - } + String timezone = (String) Context.getPermissionsManager().lookupPreference(userId, "timezone", null); return timezone != null ? TimeZone.getTimeZone(timezone) : TimeZone.getDefault(); } -- cgit v1.2.3