From 89992f541cde49fee7e57ba4d061f9d22984073f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 5 Mar 2018 13:49:03 +0100 Subject: [PATCH] calculate automatic timeout labels dynamically --- .../conversations/ui/SettingsActivity.java | 20 +++++ .../conversations/utils/TimeframeUtils.java | 75 +++++++++++++++++++ src/main/res/values/arrays.xml | 11 +-- src/main/res/values/strings.xml | 28 ++++++- src/main/res/xml/preferences.xml | 4 +- 5 files changed, 122 insertions(+), 16 deletions(-) create mode 100644 src/main/java/eu/siacs/conversations/utils/TimeframeUtils.java diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index 39a2d71e3..3167b8adc 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -35,6 +35,7 @@ import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.services.ExportLogsService; import eu.siacs.conversations.services.MemorizingTrustManager; import eu.siacs.conversations.ui.util.Color; +import eu.siacs.conversations.utils.TimeframeUtils; import eu.siacs.conversations.xmpp.XmppConnection; import eu.siacs.conversations.xmpp.jid.InvalidJidException; import eu.siacs.conversations.xmpp.jid.Jid; @@ -109,6 +110,25 @@ 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); + } + + boolean removeLocation = new Intent("eu.siacs.conversations.location.request").resolveActivity(getPackageManager()) == null; boolean removeVoice = new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) == null; diff --git a/src/main/java/eu/siacs/conversations/utils/TimeframeUtils.java b/src/main/java/eu/siacs/conversations/utils/TimeframeUtils.java new file mode 100644 index 000000000..33b43c5c3 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/utils/TimeframeUtils.java @@ -0,0 +1,75 @@ +/* + * 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 eu.siacs.conversations.utils; + +import android.content.Context; +import android.support.annotation.PluralsRes; + +import eu.siacs.conversations.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 8773fda1a..5c332b8ce 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -98,18 +98,11 @@ 610 2584 - + 0 86400 604800 2592000 15811200 - - - @string/never - @string/timeout_24_hours - @string/timeout_7_days - @string/timeout_30_days - @string/timeout_6_months - + diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 814bf9ee2..ffe61d427 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -658,10 +658,30 @@ Hide inactive Distrust device Are you sure you want to remove the verification for this device?\nThis device and messages coming from that device will be marked as untrusted. - 24 hours - 7 days - 30 days - 6 months + + %d second + %d seconds + + + %d minute + %d minutes + + + %d hour + %d hours + + + %d day + %d days + + + %d week + %d weeks + + + %d month + %d months + Automatic message deletion Automatically delete messages from this device that are older than the configured time frame. Encrypting message diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 91834c879..e38cb3f3a 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -192,9 +192,7 @@ android:key="automatic_message_deletion" android:title="@string/pref_automatically_delete_messages" android:summary="@string/pref_automatically_delete_messages_description" - 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"/>