From f9ddb3a3a45b5845f8627d37d0fe95ef240679e5 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Thu, 25 Feb 2021 15:58:28 +0000 Subject: [PATCH] Set default timer duration to 1 minute for testing. --- .../briar/android/conversation/ConversationViewModel.java | 4 ++-- .../briar/api/autodelete/AutoDeleteManager.java | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java index 4e3caf5d4..4a3130f48 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java @@ -62,7 +62,6 @@ import androidx.lifecycle.MutableLiveData; import static androidx.lifecycle.Transformations.map; import static java.util.Objects.requireNonNull; -import static java.util.concurrent.TimeUnit.DAYS; import static java.util.logging.Level.INFO; import static java.util.logging.Level.WARNING; import static java.util.logging.Logger.getLogger; @@ -75,6 +74,7 @@ import static org.briarproject.briar.android.view.TextSendController.SendState.E import static org.briarproject.briar.android.view.TextSendController.SendState.SENT; import static org.briarproject.briar.android.view.TextSendController.SendState.UNEXPECTED_TIMER; import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER; +import static org.briarproject.briar.api.autodelete.AutoDeleteManager.DEFAULT_TIMER_DURATION; import static org.briarproject.briar.api.messaging.PrivateMessageFormat.TEXT_IMAGES; import static org.briarproject.briar.api.messaging.PrivateMessageFormat.TEXT_ONLY; @@ -393,7 +393,7 @@ public class ConversationViewModel extends DbViewModel } void setAutoDeleteTimerEnabled(boolean enabled) { - final long timer = enabled ? DAYS.toMillis(7) : NO_AUTO_DELETE_TIMER; + long timer = enabled ? DEFAULT_TIMER_DURATION : NO_AUTO_DELETE_TIMER; // ContactId is set before menu gets inflated and UI interaction final ContactId c = requireNonNull(contactId); runOnDbThread(() -> { diff --git a/briar-api/src/main/java/org/briarproject/briar/api/autodelete/AutoDeleteManager.java b/briar-api/src/main/java/org/briarproject/briar/api/autodelete/AutoDeleteManager.java index fac485335..b0e00a061 100644 --- a/briar-api/src/main/java/org/briarproject/briar/api/autodelete/AutoDeleteManager.java +++ b/briar-api/src/main/java/org/briarproject/briar/api/autodelete/AutoDeleteManager.java @@ -6,6 +6,8 @@ import org.briarproject.bramble.api.db.Transaction; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; import org.briarproject.bramble.api.sync.ClientId; +import static java.util.concurrent.TimeUnit.MINUTES; + @NotNullByDefault public interface AutoDeleteManager { @@ -24,6 +26,12 @@ public interface AutoDeleteManager { */ int MINOR_VERSION = 0; + /** + * The default auto-delete timer duration. + * TODO: Change this to one week before release + */ + long DEFAULT_TIMER_DURATION = MINUTES.toMillis(1); + /** * Returns the auto-delete timer duration for the given contact. Use * {@link #getAutoDeleteTimer(Transaction, ContactId, long)} if the timer