From e879c6e1c2e2d56c1d1818460fc3b870fa39869e Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 1 Aug 2017 10:44:14 +0200 Subject: refactored retrieval of default preferences --- src/main/java/de/pixart/messenger/parser/MessageParser.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/main/java/de/pixart/messenger/parser/MessageParser.java') diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index c5e818f1a..9a8e005b8 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; +import java.util.Locale; import java.util.Set; import java.util.UUID; @@ -734,17 +735,11 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece } } - private static SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:ss"); + private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat("HH:mm:ss", Locale.ENGLISH); private void activateGracePeriod(Account account) { - long duration; - long defaultValue = mXmppConnectionService.getResources().getInteger(R.integer.grace_period); - try { - duration = Long.parseLong(mXmppConnectionService.getPreferences().getString("grace_period_length", String.valueOf(defaultValue))) * 1000; - } catch (NumberFormatException e) { - duration = defaultValue * 1000; - } - Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": activating grace period (" + duration + ") till " + TIME_FORMAT.format(new Date(System.currentTimeMillis() + duration))); + long duration = mXmppConnectionService.getLongPreference("grace_period_length", R.integer.grace_period) * 1000; + Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": activating grace period till " + TIME_FORMAT.format(new Date(System.currentTimeMillis() + duration))); account.activateGracePeriod(duration); } } -- cgit v1.2.3