From 3b28bd6ce9e51af3cfc8a0dbd3fe0f189f18efed Mon Sep 17 00:00:00 2001 From: sk Date: Fri, 11 Nov 2022 19:10:45 +0100 Subject: [PATCH] get poll duration from edited status fixes mastodon#343 --- .../org/joinmastodon/android/fragments/ComposeFragment.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index be33b439..58748aba 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -27,6 +27,7 @@ import android.text.Layout; import android.text.Spanned; import android.text.TextUtils; import android.text.TextWatcher; +import android.text.format.DateUtils; import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; @@ -100,6 +101,8 @@ import org.parceler.Parcels; import java.io.InterruptedIOException; import java.net.SocketException; import java.net.UnknownHostException; +import java.time.Instant; +import java.time.temporal.ChronoUnit; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -331,6 +334,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr DraftPollOption opt=createDraftPollOption(); opt.edit.setText(eopt.title); } + pollDuration=(int)editingStatus.poll.expiresAt.minus(System.currentTimeMillis(), ChronoUnit.MILLIS).getEpochSecond(); + pollDurationStr=UiUtils.formatTimeLeft(getActivity(), editingStatus.poll.expiresAt); updatePollOptionHints(); pollDurationView.setText(getString(R.string.compose_poll_duration, pollDurationStr)); }else{