diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-01 23:34:22 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-01 23:34:22 +0200 |
commit | 50eb5f9a344131b22ccd4f6df2c2c21e15f4919c (patch) | |
tree | 6556a3ae870e211ed1a955fbdc06c1214f399644 /src | |
parent | 41f81723f55c421e5479373bb97eac6733dfb0ea (diff) |
calculate automatic timeout labels dynamically
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/SettingsActivity.java | 20 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/TimeframeUtils.java | 72 | ||||
-rw-r--r-- | src/main/res/values/arrays.xml | 13 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 29 | ||||
-rw-r--r-- | src/main/res/xml/preferences.xml | 4 |
5 files changed, 119 insertions, 19 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 diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index a8737275f..68666ddcc 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -88,22 +88,13 @@ <item>@string/presence_dnd</item> </string-array> - <string-array name="automatic_message_deletion_values"> + <integer-array name="automatic_message_deletion_values"> <item>0</item> <item>86400</item> <item>604800</item> <item>2592000</item> <item>15811200</item> <item>31622400</item> - </string-array> - - <string-array name="automatic_message_deletion"> - <item>@string/never</item> - <item>@string/timeout_24_hours</item> - <item>@string/timeout_7_days</item> - <item>@string/timeout_30_days</item> - <item>@string/timeout_6_months</item> - <item>@string/timeout_12_months</item> - </string-array> + </integer-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 41dc187be..e63bea6ae 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -673,11 +673,30 @@ <string name="pref_automatically_delete_messages_description">Automatically delete messages from this device that are older than the configured time frame.</string> <string name="pref_automatically_delete_messages">Automatic message deletion</string> <string name="not_fetching_history_retention_period">Not fetching messages due to local retention period.</string> - <string name="timeout_24_hours">24 hours</string> - <string name="timeout_7_days">7 days</string> - <string name="timeout_30_days">30 days</string> - <string name="timeout_6_months">6 months</string> - <string name="timeout_12_months">12 months</string> + <plurals name="seconds"> + <item quantity="one">%d second</item> + <item quantity="other">%d seconds</item> + </plurals> + <plurals name="minutes"> + <item quantity="one">%d minute</item> + <item quantity="other">%d minutes</item> + </plurals> + <plurals name="hours"> + <item quantity="one">%d hour</item> + <item quantity="other">%d hours</item> + </plurals> + <plurals name="days"> + <item quantity="one">%d day</item> + <item quantity="other">%d days</item> + </plurals> + <plurals name="weeks"> + <item quantity="one">%d week</item> + <item quantity="other">%d weeks</item> + </plurals> + <plurals name="months"> + <item quantity="one">%d month</item> + <item quantity="other">%d months</item> + </plurals> <string name="today">Today</string> <string name="pref_use_max_brightness_summary">Switch to maximum brightness while watching videos or images in fullscreen.</string> <string name="pref_use_max_brightness">Maximum brightness</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 27e188c7f..86fb7f057 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -305,9 +305,7 @@ android:title="@string/pref_blind_trust_before_verification" android:summary="@string/pref_blind_trust_before_verification_summary" /> <ListPreference - android:defaultValue="@integer/automatic_message_deletion" - android:entries="@array/automatic_message_deletion" - android:entryValues="@array/automatic_message_deletion_values" + android:defaultValue="@integer/automatic_message_deletion"/> android:key="automatic_message_deletion" android:summary="@string/pref_automatically_delete_messages_description" android:title="@string/pref_automatically_delete_messages" /> |