aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-01 23:34:22 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-01 23:34:22 +0200
commit50eb5f9a344131b22ccd4f6df2c2c21e15f4919c (patch)
tree6556a3ae870e211ed1a955fbdc06c1214f399644 /src/main/java/de/pixart
parent41f81723f55c421e5479373bb97eac6733dfb0ea (diff)
calculate automatic timeout labels dynamically
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r--src/main/java/de/pixart/messenger/ui/SettingsActivity.java20
-rw-r--r--src/main/java/de/pixart/messenger/utils/TimeframeUtils.java72
2 files changed, 92 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index 54bfaa854..fc50ce444 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -11,6 +11,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
@@ -36,6 +37,7 @@ import de.pixart.messenger.entities.Account;
import de.pixart.messenger.services.ExportLogsService;
import de.pixart.messenger.services.MemorizingTrustManager;
import de.pixart.messenger.ui.util.Color;
+import de.pixart.messenger.utils.TimeframeUtils;
import de.pixart.messenger.xmpp.jid.InvalidJidException;
import de.pixart.messenger.xmpp.jid.Jid;
@@ -120,6 +122,24 @@ public class SettingsActivity extends XmppActivity implements
}
}
+ ListPreference automaticMessageDeletionList = (ListPreference) mSettingsFragment.findPreference(AUTOMATIC_MESSAGE_DELETION);
+ if (automaticMessageDeletionList != null) {
+ final int[] choices = getResources().getIntArray(R.array.automatic_message_deletion_values);
+ CharSequence[] entries = new CharSequence[choices.length];
+ CharSequence[] entryValues = new CharSequence[choices.length];
+ for (int i = 0; i < choices.length; ++i) {
+ Log.d(Config.LOGTAG, "resolving choice " + choices[i]);
+ entryValues[i] = String.valueOf(choices[i]);
+ if (choices[i] == 0) {
+ entries[i] = getString(R.string.never);
+ } else {
+ entries[i] = TimeframeUtils.resolve(this, 1000L * choices[i]);
+ }
+ }
+ automaticMessageDeletionList.setEntries(entries);
+ automaticMessageDeletionList.setEntryValues(entryValues);
+ }
+
final Preference removeCertsPreference = mSettingsFragment.findPreference("remove_trusted_certificates");
if (removeCertsPreference != null) {
removeCertsPreference.setOnPreferenceClickListener(preference -> {
diff --git a/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java b/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java
new file mode 100644
index 000000000..316733b54
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2018, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package de.pixart.messenger.utils;
+
+import android.content.Context;
+import android.support.annotation.PluralsRes;
+
+import de.pixart.messenger.R;
+
+public class TimeframeUtils {
+
+ private static final Timeframe[] TIMEFRAMES;
+
+ static {
+ TIMEFRAMES = new Timeframe[]{
+ new Timeframe(1000L, R.plurals.seconds),
+ new Timeframe(60L * 1000, R.plurals.minutes),
+ new Timeframe(60L * 60 * 1000, R.plurals.hours),
+ new Timeframe(24L * 60 * 60 * 1000, R.plurals.days),
+ new Timeframe(7L * 24 * 60 * 60 * 1000, R.plurals.weeks),
+ new Timeframe(30L * 24 * 60 * 60 * 1000, R.plurals.months),
+ };
+ }
+
+ public static String resolve(Context context, long timeframe) {
+ for (int i = TIMEFRAMES.length - 1; i >= 0; --i) {
+ long duration = TIMEFRAMES[i].duration;
+ long threshold = i > 0 ? (TIMEFRAMES[i - 1].duration / 2) : 0;
+ if (timeframe >= duration - threshold) {
+ int count = (int) (timeframe / duration + ((timeframe % duration) > (duration / 2) ? 1 : 0));
+ return context.getResources().getQuantityString(TIMEFRAMES[i].name, count, count);
+ }
+ }
+ return context.getResources().getQuantityString(TIMEFRAMES[0].name, 0, 0);
+ }
+
+ private static class Timeframe {
+ public final long duration;
+ public final int name;
+
+ private Timeframe(long duration, @PluralsRes int name) {
+ this.duration = duration;
+ this.name = name;
+ }
+ }
+} \ No newline at end of file