From dd8abad8cac3726406045fcfe0e0bd073cc2941f Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Wed, 26 Feb 2020 20:41:02 +0100
Subject: [PATCH 01/42] When a plaintext share contains EXTRA_TEXT and a
 distinct EXTRA_SUBJECT, use EXTRA_SUBJECT as the content warning for the
 shared status (#1712)

---
 .../tusky/components/compose/ComposeActivity.kt     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
index d53bd6a57..87bc3e440 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
@@ -207,15 +207,14 @@ class ComposeActivity : BaseActivity(),
                     if (action != null && action == Intent.ACTION_SEND) {
                         val subject = intent.getStringExtra(Intent.EXTRA_SUBJECT)
                         val text = intent.getStringExtra(Intent.EXTRA_TEXT)
-                        val shareBody = if (subject != null && text != null) {
-                            if (subject != text && !text.contains(subject)) {
-                                String.format("%s\n%s", subject, text)
-                            } else {
-                                text
-                            }
-                        } else text ?: subject
+                        val shareBody = text ?: subject
 
                         if (shareBody != null) {
+                            if (!subject.isNullOrBlank() && subject !in shareBody) {
+                                composeContentWarningField.setText(subject)
+                                viewModel.showContentWarning.value = true
+                            }
+
                             val start = composeEditField.selectionStart.coerceAtLeast(0)
                             val end = composeEditField.selectionEnd.coerceAtLeast(0)
                             val left = min(start, end)

From 3edc47aa4ac4008fdfaf88dd30f46692918bc2bd Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Mon, 2 Mar 2020 19:34:31 +0100
Subject: [PATCH 02/42] Add option to show link previews in timelines (#1681)

* Add option to show link previews in timelines.
Addresses #1075

* Indent cards in non-selected statuses when viewing threads

* Indent cards in timelines

* Fix clipping of right side of preview in timelines
---
 .../tusky/PreferencesActivity.kt              |   2 +-
 .../tusky/adapter/NotificationsAdapter.java   |   4 +-
 .../tusky/adapter/StatusBaseViewHolder.java   |  97 +++++++++++++++++
 .../adapter/StatusDetailedViewHolder.java     | 100 +-----------------
 .../tusky/adapter/TimelineAdapter.java        |   3 +-
 .../conversation/ConversationsFragment.kt     |   8 +-
 .../fragments/ReportStatusesFragment.kt       |   8 +-
 .../fragments/SearchStatusesFragment.kt       |   4 +-
 .../tusky/fragment/NotificationsFragment.java |   4 +-
 .../tusky/fragment/TimelineFragment.java      |   6 +-
 .../tusky/fragment/ViewThreadFragment.java    |   6 +-
 .../keylesspalace/tusky/util/CardViewMode.kt  |   7 ++
 .../tusky/util/StatusDisplayOptions.kt        |   4 +-
 app/src/main/res/layout/item_status.xml       |  69 +++++++++++-
 .../main/res/layout/item_status_detailed.xml  |   4 +-
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/xml/preferences.xml          |   6 ++
 17 files changed, 214 insertions(+), 119 deletions(-)
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/util/CardViewMode.kt

diff --git a/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt b/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt
index 4fd0b5c69..157916dbd 100644
--- a/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt
@@ -129,7 +129,7 @@ class PreferencesActivity : BaseActivity(), SharedPreferences.OnSharedPreference
 
             }
             "statusTextSize", "absoluteTimeView", "showBotOverlay", "animateGifAvatars",
-            "useBlurhash" -> {
+            "useBlurhash", "showCardsInTimelines" -> {
                 restartActivitiesOnExit = true
             }
             "language" -> {
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
index 5882b64d4..61b6eecc5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
@@ -44,6 +44,7 @@ import com.keylesspalace.tusky.entity.Emoji;
 import com.keylesspalace.tusky.entity.Notification;
 import com.keylesspalace.tusky.interfaces.LinkListener;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
+import com.keylesspalace.tusky.util.CardViewMode;
 import com.keylesspalace.tusky.util.CustomEmojiHelper;
 import com.keylesspalace.tusky.util.ImageLoadingHelper;
 import com.keylesspalace.tusky.util.LinkHelper;
@@ -230,7 +231,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
                 mediaPreviewEnabled,
                 statusDisplayOptions.useAbsoluteTime(),
                 statusDisplayOptions.showBotOverlay(),
-                statusDisplayOptions.useBlurhash()
+                statusDisplayOptions.useBlurhash(),
+                CardViewMode.NONE
         );
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index d9acafe25..30baa5034 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -8,9 +8,11 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -22,14 +24,18 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners;
 import com.google.android.material.button.MaterialButton;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.entity.Attachment;
 import com.keylesspalace.tusky.entity.Attachment.Focus;
 import com.keylesspalace.tusky.entity.Attachment.MetaData;
+import com.keylesspalace.tusky.entity.Card;
 import com.keylesspalace.tusky.entity.Emoji;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
+import com.keylesspalace.tusky.util.CardViewMode;
 import com.keylesspalace.tusky.util.CustomEmojiHelper;
 import com.keylesspalace.tusky.util.HtmlUtils;
 import com.keylesspalace.tusky.util.ImageLoadingHelper;
@@ -86,6 +92,12 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     private TextView pollDescription;
     private Button pollButton;
 
+    private LinearLayout cardView;
+    private LinearLayout cardInfo;
+    private ImageView cardImage;
+    private TextView cardTitle;
+    private TextView cardDescription;
+    private TextView cardUrl;
     private PollAdapter pollAdapter;
 
     private SimpleDateFormat shortSdf;
@@ -143,6 +155,13 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         pollDescription = itemView.findViewById(R.id.status_poll_description);
         pollButton = itemView.findViewById(R.id.status_poll_button);
 
+        cardView = itemView.findViewById(R.id.status_card_view);
+        cardInfo = itemView.findViewById(R.id.card_info);
+        cardImage = itemView.findViewById(R.id.card_image);
+        cardTitle = itemView.findViewById(R.id.card_title);
+        cardDescription = itemView.findViewById(R.id.card_description);
+        cardUrl = itemView.findViewById(R.id.card_link);
+
         pollAdapter = new PollAdapter();
         pollOptions.setAdapter(pollAdapter);
         pollOptions.setLayoutManager(new LinearLayoutManager(pollOptions.getContext()));
@@ -683,6 +702,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                 hideSensitiveMediaWarning();
             }
 
+            if (cardView != null) {
+                setupCard(status, statusDisplayOptions.cardViewMode());
+            }
+
             setupButtons(listener, status.getSenderId());
             setRebloggingEnabled(status.getRebloggingEnabled(), status.getVisibility());
 
@@ -911,6 +934,80 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         return pollDescription.getContext().getString(R.string.poll_info_format, votesText, pollDurationInfo);
     }
 
+    protected void setupCard(StatusViewData.Concrete status, CardViewMode cardViewMode) {
+        if (cardViewMode != CardViewMode.NONE && status.getAttachments().size() == 0 && status.getCard() != null && !TextUtils.isEmpty(status.getCard().getUrl())) {
+            final Card card = status.getCard();
+            cardView.setVisibility(View.VISIBLE);
+            cardTitle.setText(card.getTitle());
+            if (TextUtils.isEmpty(card.getDescription()) && TextUtils.isEmpty(card.getAuthorName())) {
+                cardDescription.setVisibility(View.GONE);
+            } else {
+                cardDescription.setVisibility(View.VISIBLE);
+                if (TextUtils.isEmpty(card.getDescription())) {
+                    cardDescription.setText(card.getAuthorName());
+                } else {
+                    cardDescription.setText(card.getDescription());
+                }
+            }
+
+            cardUrl.setText(card.getUrl());
+
+            if (!TextUtils.isEmpty(card.getImage())) {
+
+                int topLeftRadius = 0;
+                int topRightRadius = 0;
+                int bottomRightRadius = 0;
+                int bottomLeftRadius = 0;
+
+                int radius = cardImage.getContext().getResources()
+                        .getDimensionPixelSize(R.dimen.card_radius);
+
+                if (card.getWidth() > card.getHeight()) {
+                    cardView.setOrientation(LinearLayout.VERTICAL);
+
+                    cardImage.getLayoutParams().height = cardImage.getContext().getResources()
+                            .getDimensionPixelSize(R.dimen.card_image_vertical_height);
+                    cardImage.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
+                    cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+                    cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
+                    topLeftRadius = radius;
+                    topRightRadius = radius;
+                } else {
+                    cardView.setOrientation(LinearLayout.HORIZONTAL);
+                    cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+                    cardImage.getLayoutParams().width = cardImage.getContext().getResources()
+                            .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
+                    cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+                    cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
+                    topLeftRadius = radius;
+                    bottomLeftRadius = radius;
+                }
+
+
+                Glide.with(cardImage)
+                        .load(card.getImage())
+                        .transform(
+                                new CenterCrop(),
+                                new GranularRoundedCorners(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius)
+                        )
+                        .into(cardImage);
+            } else {
+                cardView.setOrientation(LinearLayout.HORIZONTAL);
+                cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
+                cardImage.getLayoutParams().width = cardImage.getContext().getResources()
+                        .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
+                cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+                cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
+                cardImage.setImageResource(R.drawable.card_image_placeholder);
+            }
+
+            cardView.setOnClickListener(v -> LinkHelper.openLink(card.getUrl(), v.getContext()));
+            cardView.setClipToOutline(true);
+        } else {
+            cardView.setVisibility(View.GONE);
+        }
+    }
+
     private static String formatDuration(double durationInSeconds) {
         int seconds = (int) Math.round(durationInSeconds) % 60;
         int minutes = (int) durationInSeconds % 3600 / 60;
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
index 06b8aaf6e..0d844b914 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java
@@ -4,25 +4,18 @@ import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.CenterCrop;
-import com.bumptech.glide.load.resource.bitmap.GranularRoundedCorners;
 import com.keylesspalace.tusky.R;
-import com.keylesspalace.tusky.entity.Card;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
+import com.keylesspalace.tusky.util.CardViewMode;
 import com.keylesspalace.tusky.util.LinkHelper;
 import com.keylesspalace.tusky.util.StatusDisplayOptions;
 import com.keylesspalace.tusky.viewdata.StatusViewData;
@@ -33,27 +26,13 @@ import java.util.Date;
 class StatusDetailedViewHolder extends StatusBaseViewHolder {
     private TextView reblogs;
     private TextView favourites;
-    private LinearLayout cardView;
-    private LinearLayout cardInfo;
-    private ImageView cardImage;
-    private TextView cardTitle;
-    private TextView cardDescription;
-    private TextView cardUrl;
     private View infoDivider;
 
     StatusDetailedViewHolder(View view) {
         super(view);
         reblogs = view.findViewById(R.id.status_reblogs);
         favourites = view.findViewById(R.id.status_favourites);
-        cardView = view.findViewById(R.id.card_view);
-        cardInfo = view.findViewById(R.id.card_info);
-        cardImage = view.findViewById(R.id.card_image);
-        cardTitle = view.findViewById(R.id.card_title);
-        cardDescription = view.findViewById(R.id.card_description);
-        cardUrl = view.findViewById(R.id.card_link);
         infoDivider = view.findViewById(R.id.status_info_divider);
-
-        cardView.setClipToOutline(true);
     }
 
     @Override
@@ -127,6 +106,7 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
                                    StatusDisplayOptions statusDisplayOptions,
                                    @Nullable Object payloads) {
         super.setupWithStatus(status, listener, statusDisplayOptions, payloads);
+        setupCard(status, CardViewMode.FULL_WIDTH); // Always show card for detailed status
         if (payloads == null) {
             setReblogAndFavCount(status.getReblogsCount(), status.getFavouritesCount(), listener);
 
@@ -145,82 +125,6 @@ class StatusDetailedViewHolder extends StatusBaseViewHolder {
 
             content.setOnLongClickListener(longClickListener);
             contentWarningDescription.setOnLongClickListener(longClickListener);
-
-            if (status.getAttachments().size() == 0 && status.getCard() != null && !TextUtils.isEmpty(status.getCard().getUrl())) {
-                final Card card = status.getCard();
-                cardView.setVisibility(View.VISIBLE);
-                cardTitle.setText(card.getTitle());
-                if (TextUtils.isEmpty(card.getDescription()) && TextUtils.isEmpty(card.getAuthorName())) {
-                    cardDescription.setVisibility(View.GONE);
-                } else {
-                    cardDescription.setVisibility(View.VISIBLE);
-                    if (TextUtils.isEmpty(card.getDescription())) {
-                        cardDescription.setText(card.getAuthorName());
-                    } else {
-                        cardDescription.setText(card.getDescription());
-                    }
-                }
-
-                cardUrl.setText(card.getUrl());
-
-                if (!TextUtils.isEmpty(card.getImage())) {
-
-                    int topLeftRadius = 0;
-                    int topRightRadius = 0;
-                    int bottomRightRadius = 0;
-                    int bottomLeftRadius = 0;
-
-                    int radius = cardImage.getContext().getResources()
-                            .getDimensionPixelSize(R.dimen.card_radius);
-
-                    if (card.getWidth() > card.getHeight()) {
-                        cardView.setOrientation(LinearLayout.VERTICAL);
-
-                        cardImage.getLayoutParams().height = cardImage.getContext().getResources()
-                                .getDimensionPixelSize(R.dimen.card_image_vertical_height);
-                        cardImage.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
-                        cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
-                        cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
-                        topLeftRadius = radius;
-                        topRightRadius = radius;
-                    } else {
-                        cardView.setOrientation(LinearLayout.HORIZONTAL);
-                        cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
-                        cardImage.getLayoutParams().width = cardImage.getContext().getResources()
-                                .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
-                        cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
-                        cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
-                        topLeftRadius = radius;
-                        bottomLeftRadius = radius;
-                    }
-
-
-                    Glide.with(cardImage)
-                            .load(card.getImage())
-                            .transform(
-                                    new CenterCrop(),
-                                    new GranularRoundedCorners(topLeftRadius, topRightRadius, bottomRightRadius, bottomLeftRadius)
-                            )
-                            .into(cardImage);
-
-                } else {
-                    cardView.setOrientation(LinearLayout.HORIZONTAL);
-                    cardImage.getLayoutParams().height = ViewGroup.LayoutParams.MATCH_PARENT;
-                    cardImage.getLayoutParams().width = cardImage.getContext().getResources()
-                            .getDimensionPixelSize(R.dimen.card_image_horizontal_width);
-                    cardInfo.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
-                    cardInfo.getLayoutParams().width = ViewGroup.LayoutParams.MATCH_PARENT;
-
-                    cardImage.setImageResource(R.drawable.card_image_placeholder);
-
-                }
-
-                cardView.setOnClickListener(v -> LinkHelper.openLink(card.getUrl(), v.getContext()));
-
-            } else {
-                cardView.setVisibility(View.GONE);
-            }
-
             setStatusVisibility(status.getVisibility());
         }
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java
index 464d2bc63..307ddfc50 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java
@@ -63,7 +63,8 @@ public final class TimelineAdapter extends RecyclerView.Adapter {
                 mediaPreviewEnabled,
                 statusDisplayOptions.useAbsoluteTime(),
                 statusDisplayOptions.showBotOverlay(),
-                statusDisplayOptions.useBlurhash()
+                statusDisplayOptions.useBlurhash(),
+                statusDisplayOptions.cardViewMode()
         );
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
index fbc342810..65816c18a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
@@ -36,10 +36,7 @@ import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.fragment.SFragment
 import com.keylesspalace.tusky.interfaces.ReselectableFragment
 import com.keylesspalace.tusky.interfaces.StatusActionListener
-import com.keylesspalace.tusky.util.NetworkState
-import com.keylesspalace.tusky.util.StatusDisplayOptions
-import com.keylesspalace.tusky.util.ThemeUtils
-import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.*
 import kotlinx.android.synthetic.main.fragment_timeline.*
 import javax.inject.Inject
 
@@ -68,7 +65,8 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
                 mediaPreviewEnabled = accountManager.activeAccount?.mediaPreviewEnabled ?: true,
                 useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false),
                 showBotOverlay = preferences.getBoolean("showBotOverlay", true),
-                useBlurhash = preferences.getBoolean("useBlurhash", true)
+                useBlurhash = preferences.getBoolean("useBlurhash", true),
+                cardViewMode = CardViewMode.NONE
         )
 
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
index 3e9bd622d..f30406ce1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
@@ -43,10 +43,7 @@ import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.Attachment
 import com.keylesspalace.tusky.entity.Status
-import com.keylesspalace.tusky.util.StatusDisplayOptions
-import com.keylesspalace.tusky.util.ThemeUtils
-import com.keylesspalace.tusky.util.hide
-import com.keylesspalace.tusky.util.show
+import com.keylesspalace.tusky.util.*
 import com.keylesspalace.tusky.viewdata.AttachmentViewData
 import kotlinx.android.synthetic.main.fragment_report_statuses.*
 import javax.inject.Inject
@@ -119,7 +116,8 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
                 mediaPreviewEnabled = accountManager.activeAccount?.mediaPreviewEnabled ?: true,
                 useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false),
                 showBotOverlay = false,
-                useBlurhash = preferences.getBoolean("useBlurhash", true)
+                useBlurhash = preferences.getBoolean("useBlurhash", true),
+                cardViewMode = CardViewMode.NONE
         )
 
         adapter = StatusesAdapter(statusDisplayOptions,
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
index c384d123c..3ef3d5242 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
@@ -51,6 +51,7 @@ import com.keylesspalace.tusky.entity.Attachment
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.interfaces.AccountSelectionListener
 import com.keylesspalace.tusky.interfaces.StatusActionListener
+import com.keylesspalace.tusky.util.CardViewMode
 import com.keylesspalace.tusky.util.NetworkState
 import com.keylesspalace.tusky.util.StatusDisplayOptions
 import com.keylesspalace.tusky.viewdata.AttachmentViewData
@@ -79,7 +80,8 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
                 mediaPreviewEnabled = viewModel.mediaPreviewEnabled,
                 useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false),
                 showBotOverlay = preferences.getBoolean("showBotOverlay", true),
-                useBlurhash = preferences.getBoolean("useBlurhash", true)
+                useBlurhash = preferences.getBoolean("useBlurhash", true),
+                cardViewMode = CardViewMode.NONE
         )
 
         searchRecyclerView.addItemDecoration(DividerItemDecoration(searchRecyclerView.context, DividerItemDecoration.VERTICAL))
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
index 64805a6a9..744938b32 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
@@ -69,6 +69,7 @@ import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.ActionButtonActivity;
 import com.keylesspalace.tusky.interfaces.ReselectableFragment;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
+import com.keylesspalace.tusky.util.CardViewMode;
 import com.keylesspalace.tusky.util.Either;
 import com.keylesspalace.tusky.util.HttpHeaderLink;
 import com.keylesspalace.tusky.util.ListStatusAccessibilityDelegate;
@@ -244,7 +245,8 @@ public class NotificationsFragment extends SFragment implements
                 accountManager.getActiveAccount().getMediaPreviewEnabled(),
                 preferences.getBoolean("absoluteTimeView", false),
                 preferences.getBoolean("showBotOverlay", true),
-                preferences.getBoolean("useBlurhash", true)
+                preferences.getBoolean("useBlurhash", true),
+                CardViewMode.NONE
         );
 
         adapter = new NotificationsAdapter(accountManager.getActiveAccount().getAccountId(),
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 62760d514..cb8bccd20 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -72,6 +72,7 @@ import com.keylesspalace.tusky.network.MastodonApi;
 import com.keylesspalace.tusky.repository.Placeholder;
 import com.keylesspalace.tusky.repository.TimelineRepository;
 import com.keylesspalace.tusky.repository.TimelineRequestMode;
+import com.keylesspalace.tusky.util.CardViewMode;
 import com.keylesspalace.tusky.util.Either;
 import com.keylesspalace.tusky.util.LinkHelper;
 import com.keylesspalace.tusky.util.ListStatusAccessibilityDelegate;
@@ -226,7 +227,10 @@ public class TimelineFragment extends SFragment implements
                 accountManager.getActiveAccount().getMediaPreviewEnabled(),
                 preferences.getBoolean("absoluteTimeView", false),
                 preferences.getBoolean("showBotOverlay", true),
-                preferences.getBoolean("useBlurhash", true)
+                preferences.getBoolean("useBlurhash", true),
+                preferences.getBoolean("showCardsInTimelines", false) ?
+                        CardViewMode.INDENTED :
+                        CardViewMode.NONE
         );
         adapter = new TimelineAdapter(dataSource, statusDisplayOptions, this);
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index 094dd4cee..a81253af4 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -58,6 +58,7 @@ import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.entity.StatusContext;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.network.MastodonApi;
+import com.keylesspalace.tusky.util.CardViewMode;
 import com.keylesspalace.tusky.util.ListStatusAccessibilityDelegate;
 import com.keylesspalace.tusky.util.PairedList;
 import com.keylesspalace.tusky.util.StatusDisplayOptions;
@@ -131,7 +132,10 @@ public final class ViewThreadFragment extends SFragment implements
                 accountManager.getActiveAccount().getMediaPreviewEnabled(),
                 preferences.getBoolean("absoluteTimeView", false),
                 preferences.getBoolean("showBotOverlay", true),
-                preferences.getBoolean("useBlurhash", true)
+                preferences.getBoolean("useBlurhash", true),
+                preferences.getBoolean("showCardsInTimelines", false) ?
+                        CardViewMode.INDENTED :
+                        CardViewMode.NONE
         );
         adapter = new ThreadAdapter(statusDisplayOptions, this);
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/CardViewMode.kt b/app/src/main/java/com/keylesspalace/tusky/util/CardViewMode.kt
new file mode 100644
index 000000000..2cf2348cd
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/util/CardViewMode.kt
@@ -0,0 +1,7 @@
+package com.keylesspalace.tusky.util
+
+enum class CardViewMode {
+    NONE,
+    FULL_WIDTH,
+    INDENTED
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
index 143af1f82..42fadd670 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
@@ -10,5 +10,7 @@ data class StatusDisplayOptions(
         @get:JvmName("showBotOverlay")
         val showBotOverlay: Boolean,
         @get:JvmName("useBlurhash")
-        val useBlurhash: Boolean
+        val useBlurhash: Boolean,
+        @get:JvmName("cardViewMode")
+        val cardViewMode: CardViewMode
 )
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 8db1f66fa..37ddbbe46 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -157,6 +157,73 @@
         app:layout_constraintTop_toBottomOf="@id/status_content_warning_button"
         tools:text="This is a status" />
 
+    <LinearLayout
+        android:id="@+id/status_card_view"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/card_frame"
+        android:clipChildren="true"
+        android:foreground="?attr/selectableItemBackground"
+        android:minHeight="80dp"
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="@id/status_display_name"
+        app:layout_constraintTop_toBottomOf="@+id/status_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:visibility="gone">
+
+        <ImageView
+            android:id="@+id/card_image"
+            android:layout_width="match_parent"
+            android:layout_height="300dp"
+            android:layout_margin="1dp"
+            android:background="?attr/colorBackgroundAccent"
+            android:importantForAccessibility="no"
+            android:scaleType="center" />
+
+        <LinearLayout
+            android:id="@+id/card_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="6dp"
+            android:paddingTop="6dp"
+            android:paddingRight="6dp"
+            android:paddingBottom="6dp">
+
+            <androidx.emoji.widget.EmojiTextView
+                android:id="@+id/card_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-medium"
+                android:lines="1"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="?attr/status_text_medium" />
+
+            <androidx.emoji.widget.EmojiTextView
+                android:id="@+id/card_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp"
+                android:ellipsize="end"
+                android:lineSpacingMultiplier="1.1"
+                android:maxLines="2"
+                android:textColor="?android:textColorSecondary"
+                android:textSize="?attr/status_text_medium" />
+
+            <TextView
+                android:id="@+id/card_link"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:lines="1"
+                android:textColor="?android:textColorTertiary"
+                android:textSize="?attr/status_text_medium" />
+        </LinearLayout>
+    </LinearLayout>
+
     <Button
         android:id="@+id/button_toggle_content"
         style="@style/TuskyButton.Outlined"
@@ -175,7 +242,7 @@
         android:textSize="?attr/status_text_medium"
         android:visibility="gone"
         app:layout_constraintStart_toStartOf="@id/status_display_name"
-        app:layout_constraintTop_toBottomOf="@id/status_content"
+        app:layout_constraintTop_toBottomOf="@id/status_card_view"
         tools:text="@string/status_content_show_less"
         tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 0436b0609..8e1886f54 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -131,7 +131,7 @@
         tools:text="Status content. Can be pretty long. " />
 
     <LinearLayout
-        android:id="@+id/card_view"
+        android:id="@+id/status_card_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
@@ -204,7 +204,7 @@
         android:layout_marginBottom="4dp"
         android:background="@drawable/media_preview_outline"
         android:importantForAccessibility="noHideDescendants"
-        app:layout_constraintTop_toBottomOf="@id/card_view">
+        app:layout_constraintTop_toBottomOf="@id/status_card_view">
 
         <com.keylesspalace.tusky.view.MediaPreviewImageView
             android:id="@+id/status_media_preview_0"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f6b49e195..a47d4fce2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -548,5 +548,6 @@
     <string name="no_saved_status">You don\'t have any drafts.</string>
     <string name="no_scheduled_status">You don\'t have any scheduled statuses.</string>
     <string name="warning_scheduling_interval">Mastodon has a minimum scheduling interval of 5 minutes.</string>
+    <string name="pref_title_show_cards_in_timelines">Show link previews in timelines</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 6dc1faa9c..d2e2bfae8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -72,6 +72,12 @@
             android:title="@string/pref_title_show_notifications_filter"
             app:singleLineTitle="false" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="showCardsInTimelines"
+            android:title="@string/pref_title_show_cards_in_timelines"
+            app:singleLineTitle="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_title_browser_settings">

From 712f61b15ad46c1a96ed362acf64286193c68b1a Mon Sep 17 00:00:00 2001
From: Ivan Kupalov <charlag@tuta.io>
Date: Mon, 2 Mar 2020 19:36:44 +0100
Subject: [PATCH 03/42] Add "more" popup to a11y menu, fix #1710 (#1714)

---
 .../tusky/util/ListStatusAccessibilityDelegate.kt      | 10 ++++++++++
 app/src/main/res/values/actions.xml                    |  1 +
 2 files changed, 11 insertions(+)

diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt b/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt
index 8373d2bc3..8594dfc60 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt
@@ -82,6 +82,8 @@ class ListStatusAccessibilityDelegate(
                 }
                 if (status.reblogsCount > 0) info.addAction(openRebloggedByAction)
                 if (status.favouritesCount > 0) info.addAction(openFavsAction)
+
+                info.addAction(moreAction)
             }
 
         }
@@ -150,6 +152,9 @@ class ListStatusAccessibilityDelegate(
                     interrupt()
                     statusActionListener.onShowFavs(pos)
                 }
+                R.id.action_more -> {
+                    statusActionListener.onMore(host, pos)
+                }
                 else -> return super.performAccessibilityAction(host, action, args)
             }
             return true
@@ -311,5 +316,10 @@ class ListStatusAccessibilityDelegate(
             R.id.action_open_faved_by,
             context.getString(R.string.action_open_faved_by))
 
+    private val moreAction = AccessibilityActionCompat(
+            R.id.action_more,
+            context.getString(R.string.action_more)
+    )
+
     private data class LinkSpanInfo(val text: String, val link: String)
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/actions.xml b/app/src/main/res/values/actions.xml
index a3a3168f7..0d78f2d17 100644
--- a/app/src/main/res/values/actions.xml
+++ b/app/src/main/res/values/actions.xml
@@ -22,4 +22,5 @@
     <item name="action_open_reblogger" type="id" />
     <item name="action_open_reblogged_by" type="id" />
     <item name="action_open_faved_by" type="id" />
+    <item name="action_more" type="id" />
 </resources>
\ No newline at end of file

From 0c159e587d83737b46e1f02c371beeb5f8a3f79d Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Mon, 2 Mar 2020 19:58:15 +0100
Subject: [PATCH 04/42] upgrade Gradle and Android plugin (#1709)

* upgrade Gradle and Android plugin

* upgrade Android Gradle plugin to 3.6.1
---
 build.gradle                             | 2 +-
 gradle.properties                        | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 17952bd8d..a71af6f14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle.properties b/gradle.properties
index d3ea8914f..8144ece09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,5 +15,5 @@ org.gradle.jvmargs=-Xmx4096m
 # use parallel execution
 org.gradle.parallel=true
 
-android.enableUnitTestBinaryResources=true
 android.enableR8.fullMode=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4e1cc9db6..6254d2d4a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 67c20326f97f2f980d588d4f62828f94473c079f Mon Sep 17 00:00:00 2001
From: Ivan Kupalov <charlag@tuta.io>
Date: Tue, 3 Mar 2020 21:27:26 +0100
Subject: [PATCH 05/42] Add options to confirm reblog/unreblog actions, close
 #460 (#1650)

---
 app/build.gradle                              |  2 +-
 .../tusky/PreferencesActivity.kt              |  2 +-
 .../tusky/adapter/NotificationsAdapter.java   |  3 +-
 .../tusky/adapter/StatusBaseViewHolder.java   | 43 ++++++++++++++++---
 .../tusky/adapter/TimelineAdapter.java        |  3 +-
 .../conversation/ConversationViewHolder.java  |  3 +-
 .../conversation/ConversationsFragment.kt     |  3 +-
 .../fragments/ReportStatusesFragment.kt       |  3 +-
 .../fragments/SearchStatusesFragment.kt       |  5 ++-
 .../tusky/fragment/NotificationsFragment.java |  3 +-
 .../tusky/fragment/TimelineFragment.java      |  7 ++-
 .../tusky/fragment/ViewThreadFragment.java    |  3 +-
 .../tusky/util/StatusDisplayOptions.kt        |  4 +-
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/xml/preferences.xml          |  6 +++
 15 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 11f4474f6..1defe9f78 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -155,7 +155,7 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$daggerVersion"
     kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
 
-    implementation "com.github.connyduck:sparkbutton:3.0.0"
+    implementation "com.github.connyduck:sparkbutton:4.0.0"
 
     implementation "com.github.chrisbanes:PhotoView:2.3.0"
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt b/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt
index 157916dbd..4adfc4e98 100644
--- a/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/PreferencesActivity.kt
@@ -129,7 +129,7 @@ class PreferencesActivity : BaseActivity(), SharedPreferences.OnSharedPreference
 
             }
             "statusTextSize", "absoluteTimeView", "showBotOverlay", "animateGifAvatars",
-            "useBlurhash", "showCardsInTimelines" -> {
+            "useBlurhash", "showCardsInTimelines", "confirmReblogs" -> {
                 restartActivitiesOnExit = true
             }
             "language" -> {
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
index 61b6eecc5..b12bab338 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
@@ -232,7 +232,8 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
                 statusDisplayOptions.useAbsoluteTime(),
                 statusDisplayOptions.showBotOverlay(),
                 statusDisplayOptions.useBlurhash(),
-                CardViewMode.NONE
+                CardViewMode.NONE,
+                statusDisplayOptions.confirmReblogs()
         );
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 30baa5034..ad0e6573d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -19,6 +19,7 @@ import android.widget.Toast;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -209,7 +210,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             contentWarningDescription.setVisibility(View.VISIBLE);
             contentWarningButton.setVisibility(View.VISIBLE);
             setContentWarningButtonText(expanded);
-            contentWarningButton.setOnClickListener( view -> {
+            contentWarningButton.setOnClickListener(view -> {
                 contentWarningDescription.invalidate();
                 if (getAdapterPosition() != RecyclerView.NO_POSITION) {
                     listener.onExpandedChange(!expanded, getAdapterPosition());
@@ -227,7 +228,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     }
 
     private void setContentWarningButtonText(boolean expanded) {
-        if(expanded) {
+        if (expanded) {
             contentWarningButton.setText(R.string.status_content_warning_show_less);
         } else {
             contentWarningButton.setText(R.string.status_content_warning_show_more);
@@ -610,7 +611,9 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         sensitiveMediaShow.setVisibility(View.GONE);
     }
 
-    protected void setupButtons(final StatusActionListener listener, final String accountId) {
+    protected void setupButtons(final StatusActionListener listener, final String accountId,
+                                final String statusContent,
+                                StatusDisplayOptions statusDisplayOptions) {
 
         avatar.setOnClickListener(v -> listener.onViewAccount(accountId));
         replyButton.setOnClickListener(v -> {
@@ -623,7 +626,13 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             reblogButton.setEventListener((button, buttonState) -> {
                 int position = getAdapterPosition();
                 if (position != RecyclerView.NO_POSITION) {
-                    listener.onReblog(buttonState, position);
+                    listener.onReblog(!buttonState, position);
+                }
+                if (statusDisplayOptions.confirmReblogs()) {
+                    showConfirmReblogDialog(listener, statusContent, buttonState, position);
+                    return false;
+                } else {
+                    return true;
                 }
             });
         }
@@ -631,15 +640,17 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         favouriteButton.setEventListener((button, buttonState) -> {
             int position = getAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
-                listener.onFavourite(buttonState, position);
+                listener.onFavourite(!buttonState, position);
             }
+            return true;
         });
 
         bookmarkButton.setEventListener((button, buttonState) -> {
             int position = getAdapterPosition();
             if (position != RecyclerView.NO_POSITION) {
-                listener.onBookmark(buttonState, position);
+                listener.onBookmark(!buttonState, position);
             }
+            return true;
         });
 
         moreButton.setOnClickListener(v -> {
@@ -662,6 +673,23 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         itemView.setOnClickListener(viewThreadListener);
     }
 
+    private void showConfirmReblogDialog(StatusActionListener listener,
+                                         String statusContent,
+                                         boolean buttonState,
+                                         int position) {
+        int okButtonTextId = buttonState ? R.string.action_unreblog : R.string.action_reblog;
+        new AlertDialog.Builder(reblogButton.getContext())
+                .setMessage(statusContent)
+                .setPositiveButton(okButtonTextId, (__, ___) -> {
+                    listener.onReblog(!buttonState, position);
+                    if (!buttonState) {
+                        // Play animation only when it's reblog, not unreblog
+                        reblogButton.playAnimation();
+                    }
+                })
+                .show();
+    }
+
     public void setupWithStatus(StatusViewData.Concrete status, final StatusActionListener listener,
                                 StatusDisplayOptions statusDisplayOptions) {
         this.setupWithStatus(status, listener, statusDisplayOptions, null);
@@ -706,7 +734,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
                 setupCard(status, statusDisplayOptions.cardViewMode());
             }
 
-            setupButtons(listener, status.getSenderId());
+            setupButtons(listener, status.getSenderId(), status.getContent().toString(),
+                    statusDisplayOptions);
             setRebloggingEnabled(status.getRebloggingEnabled(), status.getVisibility());
 
             setSpoilerAndContent(status.isExpanded(), status.getContent(), status.getSpoilerText(), status.getMentions(), status.getStatusEmojis(), status.getPoll(), statusDisplayOptions, listener);
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java
index 307ddfc50..91ec25e2f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/TimelineAdapter.java
@@ -64,7 +64,8 @@ public final class TimelineAdapter extends RecyclerView.Adapter {
                 statusDisplayOptions.useAbsoluteTime(),
                 statusDisplayOptions.showBotOverlay(),
                 statusDisplayOptions.useBlurhash(),
-                statusDisplayOptions.cardViewMode()
+                statusDisplayOptions.cardViewMode(),
+                statusDisplayOptions.confirmReblogs()
         );
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
index 365575994..6727156d0 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java
@@ -104,7 +104,8 @@ public class ConversationViewHolder extends StatusBaseViewHolder {
             hideSensitiveMediaWarning();
         }
 
-        setupButtons(listener, account.getId());
+        setupButtons(listener, account.getId(), status.getContent().toString(),
+                statusDisplayOptions);
 
         setSpoilerAndContent(status.getExpanded(), status.getContent(), status.getSpoilerText(),
                 status.getMentions(), status.getEmojis(),
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
index 65816c18a..a91ed2f08 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
@@ -66,7 +66,8 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
                 useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false),
                 showBotOverlay = preferences.getBoolean("showBotOverlay", true),
                 useBlurhash = preferences.getBoolean("useBlurhash", true),
-                cardViewMode = CardViewMode.NONE
+                cardViewMode = CardViewMode.NONE,
+                confirmReblogs = preferences.getBoolean("confirmReblogs", true)
         )
 
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
index f30406ce1..dad6fe1f5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
@@ -117,7 +117,8 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
                 useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false),
                 showBotOverlay = false,
                 useBlurhash = preferences.getBoolean("useBlurhash", true),
-                cardViewMode = CardViewMode.NONE
+                cardViewMode = CardViewMode.NONE,
+                confirmReblogs = preferences.getBoolean("confirmReblogs", true)
         )
 
         adapter = StatusesAdapter(statusDisplayOptions,
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
index 3ef3d5242..ac171b9e7 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
@@ -71,7 +71,7 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
         get() = viewModel.statuses
 
     private val searchAdapter
-            get() = super.adapter as SearchStatusesAdapter
+        get() = super.adapter as SearchStatusesAdapter
 
     override fun createAdapter(): PagedListAdapter<Pair<Status, StatusViewData.Concrete>, *> {
         val preferences = PreferenceManager.getDefaultSharedPreferences(searchRecyclerView.context)
@@ -81,7 +81,8 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
                 useAbsoluteTime = preferences.getBoolean("absoluteTimeView", false),
                 showBotOverlay = preferences.getBoolean("showBotOverlay", true),
                 useBlurhash = preferences.getBoolean("useBlurhash", true),
-                cardViewMode = CardViewMode.NONE
+                cardViewMode = CardViewMode.NONE,
+                confirmReblogs = preferences.getBoolean("confirmReblogs", true)
         )
 
         searchRecyclerView.addItemDecoration(DividerItemDecoration(searchRecyclerView.context, DividerItemDecoration.VERTICAL))
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
index 744938b32..e8a4b5f6c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
@@ -246,7 +246,8 @@ public class NotificationsFragment extends SFragment implements
                 preferences.getBoolean("absoluteTimeView", false),
                 preferences.getBoolean("showBotOverlay", true),
                 preferences.getBoolean("useBlurhash", true),
-                CardViewMode.NONE
+                CardViewMode.NONE,
+                preferences.getBoolean("confirmReblogs", true)
         );
 
         adapter = new NotificationsAdapter(accountManager.getActiveAccount().getAccountId(),
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index cb8bccd20..8db927b29 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -230,7 +230,8 @@ public class TimelineFragment extends SFragment implements
                 preferences.getBoolean("useBlurhash", true),
                 preferences.getBoolean("showCardsInTimelines", false) ?
                         CardViewMode.INDENTED :
-                        CardViewMode.NONE
+                        CardViewMode.NONE,
+                preferences.getBoolean("confirmReblogs", true)
         );
         adapter = new TimelineAdapter(dataSource, statusDisplayOptions, this);
 
@@ -580,6 +581,10 @@ public class TimelineFragment extends SFragment implements
     @Override
     public void onReblog(final boolean reblog, final int position) {
         final Status status = statuses.get(position).asRight();
+        doReblog(reblog, position, status);
+    }
+
+    private void doReblog(boolean reblog, int position, Status status) {
         timelineCases.reblog(status, reblog)
                 .observeOn(AndroidSchedulers.mainThread())
                 .as(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index a81253af4..73011ca85 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -135,7 +135,8 @@ public final class ViewThreadFragment extends SFragment implements
                 preferences.getBoolean("useBlurhash", true),
                 preferences.getBoolean("showCardsInTimelines", false) ?
                         CardViewMode.INDENTED :
-                        CardViewMode.NONE
+                        CardViewMode.NONE,
+                preferences.getBoolean("confirmReblogs", true)
         );
         adapter = new ThreadAdapter(statusDisplayOptions, this);
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
index 42fadd670..eaaa5e19f 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusDisplayOptions.kt
@@ -12,5 +12,7 @@ data class StatusDisplayOptions(
         @get:JvmName("useBlurhash")
         val useBlurhash: Boolean,
         @get:JvmName("cardViewMode")
-        val cardViewMode: CardViewMode
+        val cardViewMode: CardViewMode,
+        @get:JvmName("confirmReblogs")
+        val confirmReblogs: Boolean
 )
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a47d4fce2..c21bdc9df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -549,5 +549,6 @@
     <string name="no_scheduled_status">You don\'t have any scheduled statuses.</string>
     <string name="warning_scheduling_interval">Mastodon has a minimum scheduling interval of 5 minutes.</string>
     <string name="pref_title_show_cards_in_timelines">Show link previews in timelines</string>
+    <string name="pref_title_confirm_reblogs">Show confirmation dialog before boosting</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d2e2bfae8..b04ccacc7 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -78,6 +78,12 @@
             android:title="@string/pref_title_show_cards_in_timelines"
             app:singleLineTitle="false" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="confirmReblogs"
+            android:title="@string/pref_title_confirm_reblogs"
+            app:singleLineTitle="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/pref_title_browser_settings">

From 75336fe66ab7ad46685f6dc4cc389c431d5dc0c2 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Fri, 28 Feb 2020 12:41:46 +0000
Subject: [PATCH 06/42] Translated using Weblate (German)

Currently translated at 87.5% (7 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/de/
---
 fastlane/metadata/android/de/changelogs/68.txt | 3 +++
 fastlane/metadata/android/de/changelogs/70.txt | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/de/changelogs/68.txt

diff --git a/fastlane/metadata/android/de/changelogs/68.txt b/fastlane/metadata/android/de/changelogs/68.txt
new file mode 100644
index 000000000..dee85857a
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/68.txt
@@ -0,0 +1,3 @@
+Tusky v9.1
+
+Dieses Release stellt die Kompatibilität mit Mastodon 3 sicher und verbessert Geschwindigkeit und Stabilität der App.
diff --git a/fastlane/metadata/android/de/changelogs/70.txt b/fastlane/metadata/android/de/changelogs/70.txt
index d674795ad..749d0a9e8 100644
--- a/fastlane/metadata/android/de/changelogs/70.txt
+++ b/fastlane/metadata/android/de/changelogs/70.txt
@@ -5,4 +5,4 @@ Tusky v10.0
 - Du kannst jetzt Listen auf dem Hauptbildschirm anzeigen.
 - Du kannst jetzt Audio-Anhänge versenden.
 
-Und viele andere Verbesserungen und Fehlerkorrekturen!
\ No newline at end of file
+Und viele andere Verbesserungen und Fehlerkorrekturen!

From 64e500c5b398a216876595da0dbe33b79e6d5c6d Mon Sep 17 00:00:00 2001
From: Danial Behzadi <dani.behzi@ubuntu.com>
Date: Thu, 27 Feb 2020 12:36:19 +0000
Subject: [PATCH 07/42] Translated using Weblate (Persian)

Currently translated at 100.0% (8 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/fa/
---
 fastlane/metadata/android/fa/changelogs/70.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/fa/changelogs/70.txt

diff --git a/fastlane/metadata/android/fa/changelogs/70.txt b/fastlane/metadata/android/fa/changelogs/70.txt
new file mode 100644
index 000000000..f124dd4f7
--- /dev/null
+++ b/fastlane/metadata/android/fa/changelogs/70.txt
@@ -0,0 +1,8 @@
+تاسکی نگارش ۱۰.۰
+
+- اکنون می‌توانید بوق‌ها را نشان کرده و نشانک‌هایتان را فهرست کنید.
+- اکنون می‌توانید بوق‌ها را زمان‌بندی کنید. توجّه داشته باشید که زمان گزیده‌تان باید لااقل ۵ دقیقه بعد باشد.
+- اکنون می‌توانید فهرست‌ها را به صفحهٔ اصلی بیفزایید.
+- اکنون می‌توانید پیوست‌های صوتی بفرستید.
+
+و بسیاری از بهبودها و رفع اشکال‌های ریز!

From 7921a85d62dcd693d5c051cb124a876895d7a5f6 Mon Sep 17 00:00:00 2001
From: knuxify <knuxify@gmail.com>
Date: Wed, 26 Feb 2020 13:58:14 +0000
Subject: [PATCH 08/42] Translated using Weblate (Polish)

Currently translated at 100.0% (8 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/pl/
---
 fastlane/metadata/android/pl/changelogs/70.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/pl/changelogs/70.txt

diff --git a/fastlane/metadata/android/pl/changelogs/70.txt b/fastlane/metadata/android/pl/changelogs/70.txt
new file mode 100644
index 000000000..a1723c287
--- /dev/null
+++ b/fastlane/metadata/android/pl/changelogs/70.txt
@@ -0,0 +1,8 @@
+Tusky v10.0
+
+- Dodano wsparcie dla zakładek. Możesz teraz dodawać wpisy do zakładek i przeglądać zakładki w Tusky.
+- Możesz teraz zaplanować wpisy w Tusky. (Uwaga: wybrany czas do wysłania zaplanowanego wpisu musi wynosić przynajmniej 5 minut)
+- Możesz teraz dodawać listy do ekranu głównego.
+- Możesz teraz załączać pliki audio do wpisów.
+
+Plus wiele innych małych ulepszeń i poprawek!

From 522a790804e7170fbb938f04fe3522fd79da1e0d Mon Sep 17 00:00:00 2001
From: tolstoevsky <tolstoevsky@riseup.net>
Date: Wed, 26 Feb 2020 08:24:39 +0000
Subject: [PATCH 09/42] Translated using Weblate (Russian)

Currently translated at 100.0% (8 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/ru/
---
 fastlane/metadata/android/ru/changelogs/70.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/ru/changelogs/70.txt

diff --git a/fastlane/metadata/android/ru/changelogs/70.txt b/fastlane/metadata/android/ru/changelogs/70.txt
new file mode 100644
index 000000000..7b67dc66a
--- /dev/null
+++ b/fastlane/metadata/android/ru/changelogs/70.txt
@@ -0,0 +1,8 @@
+Tusky v10.0
+
+- Теперь вы можете добавлять статусы в закладки и просматривать списки закладок в Tusky.
+- Теперь вы можете отправлять отложенные посты из Tusky. Учтите, что время отправки должно быть не менее, чем на пять минут позже текущего.
+- Теперь вы можете добавлять списки на главный экран.
+- Теперь вы можете публиковать аудио-вложения из Tusky.
+
+И множество других мелких улучшений и исправлений!

From e6dc91487b3c24ad181eb04f24ecd969c93b6137 Mon Sep 17 00:00:00 2001
From: Selyan Slimane Amiri <selyan.kab@gmail.com>
Date: Fri, 28 Feb 2020 15:14:28 +0000
Subject: [PATCH 10/42] Translated using Weblate (Kabyle)

Currently translated at 25.0% (2 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/kab/
---
 fastlane/metadata/android/kab/short_description.txt | 1 +
 fastlane/metadata/android/kab/title.txt             | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/kab/short_description.txt
 create mode 100644 fastlane/metadata/android/kab/title.txt

diff --git a/fastlane/metadata/android/kab/short_description.txt b/fastlane/metadata/android/kab/short_description.txt
new file mode 100644
index 000000000..b770c5940
--- /dev/null
+++ b/fastlane/metadata/android/kab/short_description.txt
@@ -0,0 +1 @@
+Asnas isefraken aget-imiḍanen n uẓeṭṭa n tmetti Mastodon
diff --git a/fastlane/metadata/android/kab/title.txt b/fastlane/metadata/android/kab/title.txt
new file mode 100644
index 000000000..0238ffc0a
--- /dev/null
+++ b/fastlane/metadata/android/kab/title.txt
@@ -0,0 +1 @@
+Tusky

From 1239ad114ca18b87bd04f1d32b1520a71a314b51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Mon, 2 Mar 2020 14:14:09 +0000
Subject: [PATCH 11/42] Translated using Weblate (Icelandic)

Currently translated at 100.0% (8 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/is/
---
 fastlane/metadata/android/is/changelogs/70.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/is/changelogs/70.txt

diff --git a/fastlane/metadata/android/is/changelogs/70.txt b/fastlane/metadata/android/is/changelogs/70.txt
new file mode 100644
index 000000000..1525eefdd
--- /dev/null
+++ b/fastlane/metadata/android/is/changelogs/70.txt
@@ -0,0 +1,8 @@
+Tusky v10.0
+
+- Þú getur núna bákamerkt stöðufærslur og gert lista með bókamerkjunum þínum í Tusky.
+- Þú getur núna sett tíst á áætlun í Tusky. Athugaðu að tíminn sem þú velur þarf að vera í það minnsta efti 5 mínútur.
+- Þú getur núna bætt listum á aðalskjáinn.
+- Þú getur núna sent in hljóðskrár sem viðhengi í Tusky.
+
+Auk hellings af smærri lagfæringum og bætingum!

From 69f9145a23170a24c7dc419db0b543dfd9db4fa4 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Thu, 5 Mar 2020 08:41:57 +0000
Subject: [PATCH 12/42] Translated using Weblate (Japanese)

Currently translated at 50.0% (4 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/ja/
---
 fastlane/metadata/android/ja/changelogs/70.txt    |  8 ++++++++
 fastlane/metadata/android/ja/full_description.txt | 12 ++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 fastlane/metadata/android/ja/changelogs/70.txt
 create mode 100644 fastlane/metadata/android/ja/full_description.txt

diff --git a/fastlane/metadata/android/ja/changelogs/70.txt b/fastlane/metadata/android/ja/changelogs/70.txt
new file mode 100644
index 000000000..f7e42126f
--- /dev/null
+++ b/fastlane/metadata/android/ja/changelogs/70.txt
@@ -0,0 +1,8 @@
+Tusky v10.0
+
+- Tuskyでブックマークの登録、表示が行えるようになりました。
+- You can now schedule toots with Tusky. Note that the time you select has to be at least 5 minutes in the future.
+- You can now add lists to the main screen.
+- Tuskyで音声ファイルを投稿出来るようになりました。
+
+その他、多くの細かな改善とバグの修正を行いました！
diff --git a/fastlane/metadata/android/ja/full_description.txt b/fastlane/metadata/android/ja/full_description.txt
new file mode 100644
index 000000000..353726c18
--- /dev/null
+++ b/fastlane/metadata/android/ja/full_description.txt
@@ -0,0 +1,12 @@
+Tuskyは、自由でオープンソースのソーシャルネットワークサーバーであるMastodon用の動作の高速なクライアントです。
+
+• マテリアルデザイン
+• ほとんどのMastodon APIに対応
+• マルチアカウント対応
+• 時刻に基づいて自動変更可能なダークテーマとライトテーマ
+• 下書き - トゥートを作成し、保存しておく
+• 異なる絵文字形式を選択可能
+• すべての画面サイズに最適化
+• 完全にオープンソース - Googleサービスのような自由でない依存関係はありません
+
+Mastodonの詳細についてはこちらをご覧ください：https://joinmastodon.org/

From dfab2cb0008d2469580348a0d12a0a546c51c462 Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <butterflyoffire@protonmail.com>
Date: Fri, 6 Mar 2020 11:27:21 +0000
Subject: [PATCH 13/42] Translated using Weblate (Kabyle)

Currently translated at 58.5% (240 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/

Translated using Weblate (Kabyle)

Currently translated at 53.2% (218 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/

Translated using Weblate (French)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/

Translated using Weblate (Kabyle)

Currently translated at 53.2% (218 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/

Translated using Weblate (Arabic)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ar/

Translated using Weblate (Kabyle)

Currently translated at 53.2% (218 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/

Translated using Weblate (Kabyle)

Currently translated at 52.7% (216 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/

Translated using Weblate (French)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/
---
 app/src/main/res/values-ar/strings.xml  |   4 +-
 app/src/main/res/values-fr/strings.xml  |   4 +-
 app/src/main/res/values-kab/strings.xml | 154 +++++++++++++++---------
 3 files changed, 101 insertions(+), 61 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 9089cb5f8..c40e7585c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -501,4 +501,6 @@
     <string name="no_scheduled_status">ليس لديك أية منشورات مُبرمَجة للنشر.</string>
 
 <string name="error_audio_upload_size">يجب أن يكون حجم الملفات الصوتية أقل مِن 40 ميغابايت.</string>
-    </resources>
+    <string name="warning_scheduling_interval">تُقدّر أدنى فترة لبرمجة النشر في ماستدون بـ 5 دقائق.</string>
+
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 49cf48b24..36bef8c9e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -371,7 +371,7 @@
     <string name="notifications_apply_filter">Filtrer</string>
     <string name="filter_apply">Appliquer</string>
 
-    <string name="compose_shortcut_long_label">Écrire un pouet</string>
+    <string name="compose_shortcut_long_label">Rédiger un pouet</string>
     <string name="compose_shortcut_short_label">Écrire</string>
     <string name="pref_title_bot_overlay">Afficher l\'indicateur de robots</string>
 
@@ -486,4 +486,6 @@
     <string name="no_saved_status">Vous n’avez aucun brouillon.</string>
     <string name="no_scheduled_status">Vous n’avez aucun pouet planifié.</string>
 
+<string name="warning_scheduling_interval">L’intervalle minimum de planification sur Mastodon est de 5 minutes.</string>
+
 </resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 09780b592..b91bee1ed 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources><string name="action_login">Qqen γer Maṣṭudun</string>
+<resources><string name="action_login">Qqen ɣer Maṣṭudun</string>
     <string name="title_favourites">Ismenyifen</string>
     <string name="title_saved_toot">Irewwayen</string>
-    <string name="action_logout">Ffeγ</string>
-    <string name="action_view_preferences">Iγewwaṛen</string>
-    <string name="action_view_account_preferences">Iγewwaṛen n umiḍan</string>
-    <string name="action_edit_profile">Ẓreg amaγnu</string>
+    <string name="action_logout">Ffeɣ</string>
+    <string name="action_view_preferences">Iɣewwaṛen</string>
+    <string name="action_view_account_preferences">Iɣewwaṛen n umiḍan</string>
+    <string name="action_edit_profile">Ẓreg amaɣnu</string>
     <string name="action_search">Nadi</string>
-    <string name="about_title_activity">Γef</string>
-    <string name="action_lists">Umuγen</string>
-    <string name="title_lists">Umuγen</string>
-    <string name="error_compose_character_limit">Tijewwiqt-ik aṭas i γuzzifet!</string>
+    <string name="about_title_activity">Ɣef</string>
+    <string name="action_lists">Umuɣen</string>
+    <string name="title_lists">Umuɣen</string>
+    <string name="error_compose_character_limit">Tijewwiqt-ik aṭas i ɣuzzifet!</string>
     <string name="title_home">Agejdan</string>
     <string name="title_tab_preferences">Iccaren</string>
     <string name="title_view_thread">Tijewwiqt</string>
     <string name="title_statuses">Iznan</string>
     <string name="title_statuses_with_replies">S tririyin</string>
-    <string name="title_edit_profile">Ẓreg amaγnu-ik</string>
+    <string name="title_edit_profile">Ẓreg amaɣnu-ik</string>
     <string name="status_username_format">\@%s</string>
     <string name="status_content_warning_show_more">Zeṛ ugar</string>
     <string name="status_content_warning_show_less">Zeṛ kra kan</string>
@@ -35,13 +35,13 @@
     <string name="action_send_public">JEWWEQ!</string>
     <string name="action_retry">Ɛreḍ tikkelt-nniḍen</string>
     <string name="action_close">Derreɛ</string>
-    <string name="action_view_profile">Amaγnu</string>
+    <string name="action_view_profile">Amaɣnu</string>
     <string name="action_view_favourites">Ismenyifen</string>
     <string name="action_open_in_web">Ldi deg uminig</string>
     <string name="action_share">Bḍu</string>
     <string name="action_mute">Sgugem</string>
     <string name="action_access_saved_toot">Irewwayen</string>
-    <string name="action_open_faved_by">Sken-ed ismenyifen</string>
+    <string name="action_open_faved_by">Sken-d ismenyifen</string>
 
     <string name="notification_favourite_name">Ismenyifen</string>
     <plurals name="favs">
@@ -51,11 +51,11 @@
 
     <string name="no_saved_status">Ur tesɛiḍ ara irewwayen.</string>
     <string name="error_generic">Tella-d tucḍa.</string>
-    <string name="title_notifications">Tilγa</string>
+    <string name="title_notifications">Tilɣa</string>
     <string name="link_whats_an_instance">D acu i ttummant\?</string>
 
     <string name="title_bookmarks">Ticraḍ</string>
-    <string name="action_bookmark">Rnu γer ticraḍ</string>
+    <string name="action_bookmark">Rnu ɣer ticraḍ</string>
     <string name="action_view_bookmarks">Ticraḍ</string>
     <string name="action_mute_domain">Sgugem %s</string>
     <string name="action_mention">Bder</string>
@@ -64,20 +64,20 @@
     <string name="action_undo">Sefsex</string>
     <string name="action_emoji_keyboard">Anasiw n imujiyen</string>
     <string name="action_add_tab">Rnu iccer</string>
-    <string name="action_copy_link">Nγel aseγwen</string>
+    <string name="action_copy_link">Nɣel aseɣwen</string>
     <string name="action_open_as">Ldi amzun d %s</string>
     <string name="action_share_as">Bḍu amzun d…</string>
-    <string name="send_status_link_to">Bḍu aseγwen n tijewwiq s…</string>
+    <string name="send_status_link_to">Bḍu aseɣwen n tijewwiq s…</string>
     <string name="send_status_content_to">Bḍu tijewwiqt d…</string>
     <string name="hint_domain">Anta tummant\?</string>
     <string name="hint_compose">d-acu i gellan d amaynut\?</string>
     <string name="hint_search">Nadi…</string>
 
     <string name="label_quick_reply">Tiririn…</string>
-    <string name="label_avatar">Tugna n umaγnu</string>
+    <string name="label_avatar">Tugna n umaɣnu</string>
     <string name="dialog_download_image">Sider</string>
     <string name="dialog_delete_toot_warning">Kkes tijewwiqt-a\?</string>
-    <string name="pref_title_edit_notification_settings">Ẓreg tilγa</string>
+    <string name="pref_title_edit_notification_settings">Ẓreg tilɣa</string>
     <string name="pref_title_appearance_settings">Agrudem</string>
     <string name="app_theme_light">Aceɛlal</string>
     <string name="app_theme_black">Aberkan</string>
@@ -88,7 +88,7 @@
     <string name="notification_summary_medium">%1$s, %2$s, akked %3$s</string>
     <string name="notification_summary_small">%1$s akked %2$s</string>
     <string name="about_tusky_version">Tusky %s</string>
-    <string name="about_tusky_account">Amaγnu n Tusky</string>
+    <string name="about_tusky_account">Amaɣnu n Tusky</string>
 
     <string name="status_media_images">Tugniwin</string>
     <string name="status_media_video">Tibidyutin</string>
@@ -110,16 +110,16 @@
 
     <string name="action_view_mutes">Imiḍanen yettwasgugmen</string>
     <string name="action_view_blocks">Imiḍanen yettusḥebsen</string>
-    <string name="action_view_domain_mutes">Tiγula yettwaffren</string>
+    <string name="action_view_domain_mutes">Tiɣula yettwaffren</string>
     <string name="action_view_follow_requests">Isuturen n teḍfeṛt</string>
-    <string name="action_view_media">Taγwalt</string>
+    <string name="action_view_media">Taɣwalt</string>
     <string name="notifications_clear">Sfeḍ</string>
     <string name="title_mutes">Imiḍanen yettwasgugmen</string>
     <string name="title_blocks">Imiḍanen yettusḥebsen</string>
-    <string name="title_domain_mutes">Tiγula yettwaffren</string>
+    <string name="title_domain_mutes">Tiɣula yettwaffren</string>
     <string name="title_follow_requests">Isuturen n teḍfeṛt</string>
-    <string name="pref_title_notifications_enabled">Ẓreg tilγa</string>
-    <string name="title_media">Taγwalt</string>
+    <string name="pref_title_notifications_enabled">Tilɣa</string>
+    <string name="title_media">Taywalt</string>
     <string name="action_remove">Kkes</string>
     <string name="compose_shortcut_short_label">Azen</string>
 
@@ -129,27 +129,27 @@
     <string name="action_add_poll">Rnu assenqed</string>
     <string name="action_photo_take">Ṭef tugna</string>
     <string name="action_toggle_visibility">Timeẓriwt n tijewwaqt</string>
-    <string name="action_schedule_toot">Sγiwes tijewwaqt-a</string>
+    <string name="action_schedule_toot">Sɣiwes tijewwaqt-a</string>
     <string name="status_share_content">Bḍu agbur n tijewwiqt-a</string>
-    <string name="status_share_link">Bḍu aseγwen γer tijewwiqt</string>
+    <string name="status_share_link">Bḍu aseɣwen ɣer tijewwiqt</string>
     <string name="filter_addition_dialog_title">Rnu amsizdeg</string>
     <string name="filter_edit_dialog_title">Ẓreg amsizdeg</string>
-    <string name="action_create_list">Snulfu-d umuγ</string>
-    <string name="action_rename_list">Snifel isem n wumuγ</string>
-    <string name="action_delete_list">Kkes umuγ-a</string>
-    <string name="action_edit_list">Ẓreg umuγ-a</string>
-    <string name="action_add_to_list">Rnu yiwen umiḍan γer tabdert</string>
-    <string name="action_remove_from_list">Kkes amiḍan seg wumuγ</string>
+    <string name="action_create_list">Snulfu-d umuɣ</string>
+    <string name="action_rename_list">Snifel isem n wumuɣ</string>
+    <string name="action_delete_list">Kkes umuɣ-a</string>
+    <string name="action_edit_list">Ẓreg umuɣ-a</string>
+    <string name="action_add_to_list">Rnu yiwen umiḍan ɣer wummuɣ</string>
+    <string name="action_remove_from_list">Kkes amiḍan seg wumuɣ</string>
 
     <string name="profile_metadata_add">Rnu isefka</string>
-    <string name="hint_list_name">Isem n wumuγ</string>
+    <string name="hint_list_name">Isem n wumuɣ</string>
 
     <string name="select_list_title">Fren tabdart</string>
-    <string name="list">Umuγ</string>
+    <string name="list">Umuɣ</string>
     <string name="notifications_apply_filter">Sizdeg</string>
     <string name="title_accounts">Imiḍanen</string>
     <string name="add_poll_choice">Rnu yiwen wefran</string>
-    <string name="report_username_format">Ccetki γef @%s</string>
+    <string name="report_username_format">Ccetki ɣef @%s</string>
     <string name="action_report">Ccetki</string>
     <string name="action_reject">Ggami</string>
     <string name="download_image">Yessidired %1$s</string>
@@ -159,16 +159,16 @@
     <string name="login_connection">itteqqen…</string>
 
     <string name="dialog_message_uploading_media">Issalay…</string>
-    <string name="pref_title_notification_filter_poll">fukken kran n wadγaren</string>
+    <string name="pref_title_notification_filter_poll">fukken kran n wadɣaren</string>
     <string name="pref_title_timeline_filters">Imzizdigen</string>
 
     <string name="app_theme_auto">Akken yella yiṭij</string>
     <string name="pref_title_browser_settings">Iminig</string>
-    <string name="pref_title_show_replies">Sken-ed tiririyin</string>
+    <string name="pref_title_show_replies">Sken-d tiririyin</string>
     <string name="pref_title_http_proxy_settings">Apṛuksi HTTP</string>
     <string name="pref_title_http_proxy_server">Tansa n upṛuksi HTTP</string>
     <string name="notification_follow_name">Imeḍfaṛen imaynuten</string>
-    <string name="notification_poll_name">Adγaren</string>
+    <string name="notification_poll_name">Adɣaren</string>
     <string name="notification_mention_format">Yuder-ik-id %s</string>
     <string name="description_account_locked">Yettwargel umiḍan</string>
 
@@ -183,26 +183,26 @@
     <string name="restart">Ales tanekra</string>
     <string name="download_failed">Tuccḍa n usider</string>
 
-    <string name="account_moved_description">Igujj %1$s γer:</string>
+    <string name="account_moved_description">Igujj %1$s ɣer:</string>
 
     <string name="unpin_action">Kkes asenṭeḍ</string>
     <string name="conversation_1_recipients">%1$s</string>
     <string name="conversation_2_recipients">%1$s akked %2$s</string>
     <string name="conversation_more_recipients">%1$s, %2$s akked %3$d nniḍen</string>
     <string name="compose_shortcut_long_label">Aru tijewwiqt</string>
-    <string name="poll_info_format"> <!-- 15 n wadγaren • 1 n wesrag id yeqqimen --> %1$s • %2$s</string>
+    <string name="poll_info_format"> <!-- 15 n wadɣaren • 1 n wesrag id yeqqimen --> %1$s • %2$s</string>
     <plurals name="poll_info_votes">
-	<item quantity="one">%s wedγar</item>
-	<item quantity="other">%s n yedγaren</item>
+	<item quantity="one">%s n wedɣar</item>
+	<item quantity="other">%s n yedɣaren</item>
 </plurals>
     <string name="poll_info_time_relative">%s id yugran</string>
     <string name="poll_info_time_absolute">ad ifak deg %s</string>
     <string name="poll_info_closed">ifuk</string>
 
-    <string name="poll_vote">Dγer</string>
+    <string name="poll_vote">Dɣer</string>
 
-    <string name="poll_ended_voted">Ifuk, tura kan, yiwen wedγar t tteki-iḍ degs</string>
-    <string name="poll_ended_created">Ifukk yiwen wedγar id snulfaḍ</string>
+    <string name="poll_ended_voted">Ifuk, tura kan, yiwen wedɣar t tteki-iḍ degs</string>
+    <string name="poll_ended_created">Ifukk yiwen wedɣar id snulfaḍ</string>
 
     <plurals name="poll_timespan_days">
 	<item quantity="one">%d n wass</item>
@@ -214,18 +214,18 @@
 </plurals>
     <plurals name="poll_timespan_minutes">
 	<item quantity="one">%d n tasdidt</item>
-	<item quantity="other">%d n tesdidin</item>
+	<item quantity="other">%d n tisdidin</item>
 </plurals>
     <string name="button_continue">Kemmel</string>
-    <string name="button_back">Uγal</string>
+    <string name="button_back">Uɣal</string>
     <string name="failed_report">Tella-d tuccḍa deg ccetki</string>
     <string name="failed_search">Tucḍa n unadi</string>
 
     <string name="create_poll_title">Assenqed</string>
-    <string name="poll_duration_5_min">5 n tasditin</string>
-    <string name="poll_duration_30_min">30 n tasditin</string>
-    <string name="poll_duration_1_hour">1 n wesrag</string>
-    <string name="poll_duration_6_hours">6 n wesragen</string>
+    <string name="poll_duration_5_min">5 n tisdidin</string>
+    <string name="poll_duration_30_min">30 n tisdidin</string>
+    <string name="poll_duration_1_hour">1 n usrag</string>
+    <string name="poll_duration_6_hours">6 n isragen</string>
     <string name="poll_duration_1_day">1 n wass</string>
     <string name="poll_duration_3_days">3 n wussan</string>
     <string name="poll_duration_7_days">7 n wussan</string>
@@ -233,30 +233,66 @@
 
     <string name="title_follows">Ig ṭafaṛ</string>
     <string name="title_followers">Imeḍfaṛen</string>
-    <string name="hint_search_people_list">Nadi γef medden i teṭafareḍ</string>
+    <string name="hint_search_people_list">Nadi ɣef medden i teṭafareḍ</string>
     <string name="description_visiblity_private">Imeḍfaṛen</string>
 
-    <string name="action_links">Iseγwan</string>
+    <string name="action_links">Iseɣwan</string>
     <string name="action_mentions">Tibdarin</string>
     <string name="title_mentions_dialog">Tibdarin</string>
-    <string name="title_links_dialog">Iseγwan</string>
+    <string name="title_links_dialog">Iseɣwan</string>
     <string name="confirmation_reported">Yettwaceyyaɛ!</string>
     <string name="status_sent">Yettwaceyyaɛ!</string>
     <string name="search_no_results">Ula d yiwen n ugmuḍ</string>
 
     <string name="post_privacy_followers_only">I yimeḍfaṛen kan</string>
 
-    <string name="pref_status_text_size">Teγzi n weḍṛis</string>
+    <string name="pref_status_text_size">Teɣzi n weḍṛis</string>
 
     <string name="about_powered_by_tusky">Yettwamdemmar s Tusky</string>
     <string name="about_project_site">Asmel Web n usenfaṛ:
 \n https://tusky.app</string>
-    <string name="abbreviated_hours_ago">%dasr</string>
-    <string name="abbreviated_minutes_ago">%dtas</string>
-    <string name="abbreviated_seconds_ago">%dtasn</string>
+    <string name="abbreviated_hours_ago">%dsr</string>
+    <string name="abbreviated_minutes_ago">%dtsd</string>
+    <string name="abbreviated_seconds_ago">%dtsn</string>
 
     <string name="compose_save_draft">Sekles amzun d arewway\?</string>
     <string name="later">Ticki</string>
     <string name="profile_badge_bot_text">Aṛubut</string>
-    <string name="description_status_bookmarked">Yettwarna γer ticṛad</string>
+    <string name="description_status_bookmarked">Yettwarna ɣer ticṛad</string>
+    <string name="abbreviated_in_hours">deg %dsr</string>
+    <string name="abbreviated_in_minutes">deg %dtsd</string>
+    <string name="abbreviated_in_seconds">deg %dtsn</string>
+    <plurals name="poll_timespan_seconds">
+	<item quantity="one">%d n tasint</item>
+	<item quantity="other">%d n tasinin</item>
+</plurals>
+
+    <string name="status_sensitive_media_title">Agbur amḥulfu</string>
+    <string name="pref_default_media_sensitivity">Creḍ allal n teywalt amzun d amḥulfu</string>
+    <string name="action_reset_schedule">Wennez tikkelt-nniḍen</string>
+    <string name="error_media_upload_sending">Asali ur yeddi ara.</string>
+    <string name="error_sender_account_gone">Tuccḍa deg tuzna n tijewwiqt.</string>
+
+    <string name="title_public_local">Adigan</string>
+    <string name="title_licenses">Turagin</string>
+
+    <string name="status_boosted_format">Yebḍa-t %s</string>
+    <string name="notification_reblog_format">Yebḍa %s tijewwiqt-ik·im</string>
+    <string name="notification_favourite_format">Yerna %s tijewwiqt-ik·im ɣer imenyafen-is</string>
+    <string name="action_quick_reply">Tiririt taruradt</string>
+    <string name="action_reblog">Bḍu</string>
+    <string name="action_unreblog">Kkes beṭu</string>
+    <string name="action_hide_reblogs">Ffer beṭuyat</string>
+    <string name="action_show_reblogs">Sken-d beṭuyat</string>
+    <string name="action_unmute">Ur sgugum ara</string>
+    <string name="action_accept">Ddeg</string>
+    <string name="action_hashtags">Ihacṭagen</string>
+    <string name="action_open_reblogged_by">Sken-d beṭuyat</string>
+    <string name="title_hashtags_dialog">Ihacṭagen</string>
+    <string name="confirmation_unmuted">Aseqdac nni ur yettwasgugem ara tura</string>
+    <string name="confirmation_domain_unmuted">%s ur yettwaffer ara</string>
+
+    <string name="hint_note">Assisen</string>
+    <string name="label_header">Tugna n yiɣef n umaɣnu</string>
+
     </resources>

From 83e8c9eb7571638047de1b3e5e985e84f70dc195 Mon Sep 17 00:00:00 2001
From: Vegard Skjefstad <vegard@vegard.net>
Date: Fri, 6 Mar 2020 11:27:21 +0000
Subject: [PATCH 14/42] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/nb_NO/
---
 app/src/main/res/values-no-rNB/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-no-rNB/strings.xml b/app/src/main/res/values-no-rNB/strings.xml
index aeb6c51f0..9f5ec3810 100644
--- a/app/src/main/res/values-no-rNB/strings.xml
+++ b/app/src/main/res/values-no-rNB/strings.xml
@@ -520,4 +520,6 @@
 
 <string name="no_saved_status">Du har ikke lagret noen kladder.</string>
     <string name="error_audio_upload_size">Lydfiler må være mindre enn 40MB.</string>
-    </resources>
+    <string name="warning_scheduling_interval">Mastodon har et minimums planleggingsinterval på 5 minutter.</string>
+
+</resources>

From 5471670129e7dfd55b61b22fbe16102b86f9cff4 Mon Sep 17 00:00:00 2001
From: knuxify <knuxify@gmail.com>
Date: Fri, 6 Mar 2020 11:27:21 +0000
Subject: [PATCH 15/42] Translated using Weblate (Polish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pl/
---
 app/src/main/res/values-pl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d2c1acfd1..0a46fa5b4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -498,4 +498,6 @@
     <string name="no_saved_status">Nie masz żadnych szkiców.</string>
     <string name="no_scheduled_status">Nie masz żadnych zaplanowanych wpisów.</string>
 
+<string name="warning_scheduling_interval">Mastodon umożliwia wysłanie minimalnie 5 minut od zaplanowania.</string>
+
 </resources>

From 38c2c24a09b43b502871dc33f94bf6ccb97fa729 Mon Sep 17 00:00:00 2001
From: tolstoevsky <tolstoevsky@riseup.net>
Date: Fri, 6 Mar 2020 11:27:22 +0000
Subject: [PATCH 16/42] Translated using Weblate (Russian)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ru/
---
 app/src/main/res/values-ru/strings.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index c63298079..f1638c57f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -546,4 +546,13 @@
     <string name="description_status_bookmarked">Добавлено в закладки</string>
     <string name="select_list_title">Выбрать список</string>
     <string name="list">Список</string>
-    </resources>
+    <string name="error_audio_upload_size">Аудиофайлы должны быть меньше 40МБ.</string>
+    <string name="gradient_for_media">Показывать цветные градиенты для скрытых медиа</string>
+
+    <string name="post_lookup_error_format">Ошибка поиска поста %s</string>
+
+    <string name="no_saved_status">У вас нет черновиков.</string>
+    <string name="no_scheduled_status">У вас нет запланированных постов.</string>
+    <string name="warning_scheduling_interval">Минимальный интервал планирования в Mastodon составляет 5 минут.</string>
+
+</resources>

From 1710b980bc32a3ac4f274e26e36393ff187b86e7 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 6 Mar 2020 11:27:22 +0000
Subject: [PATCH 17/42] Added translation using Weblate (English (Australia))

Translated using Weblate (Swedish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/

Translated using Weblate (Japanese)

Currently translated at 87.1% (357 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ja/

Translated using Weblate (Esperanto)

Currently translated at 99.8% (409 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/
---
 app/src/main/res/values-en-rAU/strings.xml | 2 ++
 app/src/main/res/values-eo/strings.xml     | 5 ++++-
 app/src/main/res/values-ja/strings.xml     | 6 ++++++
 app/src/main/res/values-sv/strings.xml     | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/values-en-rAU/strings.xml

diff --git a/app/src/main/res/values-en-rAU/strings.xml b/app/src/main/res/values-en-rAU/strings.xml
new file mode 100644
index 000000000..a6b3daec9
--- /dev/null
+++ b/app/src/main/res/values-en-rAU/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 1779798d6..bd1672bc1 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -469,4 +469,7 @@
     <string name="list">Listo</string>
     <string name="post_lookup_error_format">Eraro dum elserĉo de la mesaĝo %s</string>
 
-</resources>
+<string name="error_audio_upload_size">Aŭdia dosiero devas esti malpli ol 40MB.</string>
+    <string name="gradient_for_media">Montri buntajn transirojn por kaŝitaj aŭdovidaĵoj</string>
+
+    </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index dfcbca0a8..90f12f08e 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -409,4 +409,10 @@
     <string name="pref_title_show_notifications_filter">通知フィルターを表示</string>
 
 
+    <string name="action_reset_schedule">リセット</string>
+    <string name="error_audio_upload_size">音声ファイルは40MB未満にしてください。</string>
+    <string name="title_bookmarks">ブックマーク</string>
+    <string name="action_bookmark">ブックマーク</string>
+    <string name="action_edit">編集</string>
+    <string name="action_view_bookmarks">ブックマーク</string>
     </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4bad9f70f..4bb611c69 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -482,4 +482,5 @@
 
 <string name="error_audio_upload_size">Ljudfiler måste vara mindre än 40MB.</string>
     <string name="no_saved_status">Du har inga utkast.</string>
+    <string name="warning_scheduling_interval">Mastodon har ett minimalt schemaläggningsintervall på 5 minuter.</string>
     </resources>

From 8ffb263e16a1c2d7a45df0e561320ee78d7afafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lanie=20Chauvel?= <perso@hack-libre.org>
Date: Fri, 6 Mar 2020 11:27:22 +0000
Subject: [PATCH 18/42] Translated using Weblate (French)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/fr/

Translated using Weblate (Esperanto)

Currently translated at 99.8% (409 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/eo/
---
 app/src/main/res/values-eo/strings.xml |  2 ++
 app/src/main/res/values-fr/strings.xml | 34 +++++++++++++-------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index bd1672bc1..a8704d16b 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -472,4 +472,6 @@
 <string name="error_audio_upload_size">Aŭdia dosiero devas esti malpli ol 40MB.</string>
     <string name="gradient_for_media">Montri buntajn transirojn por kaŝitaj aŭdovidaĵoj</string>
 
+    <string name="no_saved_status">Vi ne havas iun ajn malneton.</string>
+    <string name="no_scheduled_status">Vi ne havas iun ajn planitan mesaĝon.</string>
     </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 36bef8c9e..8d7d69526 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -39,7 +39,7 @@
     <string name="title_saved_toot">Brouillons</string>
     <string name="title_licenses">Licences</string>
     <string name="status_username_format">\@%s</string>
-    <string name="status_boosted_format">%s a boosté</string>
+    <string name="status_boosted_format">%s a partagé</string>
     <string name="status_sensitive_media_title">Contenu sensible</string>
     <string name="status_media_hidden_title">Média caché</string>
     <string name="status_sensitive_media_directions">Cliquer pour voir</string>
@@ -49,15 +49,15 @@
     <string name="status_content_show_less">Replier</string>
     <string name="message_empty">Rien ici.</string>
     <string name="footer_empty">Il n’y a aucun pouet pour le moment.\nGlissez vers le bas pour actualiser !</string>
-    <string name="notification_reblog_format">%s a boosté votre pouet</string>
+    <string name="notification_reblog_format">%s a partagé votre pouet</string>
     <string name="notification_favourite_format">%s a ajouté votre pouet à ses favoris</string>
     <string name="notification_follow_format">%s vous suit</string>
     <string name="report_username_format">Signaler @%s</string>
     <string name="report_comment_hint">Commentaires additonnels ?</string>
     <string name="action_quick_reply">Réponse rapide</string>
     <string name="action_reply">Répondre</string>
-    <string name="action_reblog">Booster</string>
-    <string name="action_unreblog">Supprimer le boost</string>
+    <string name="action_reblog">Partager</string>
+    <string name="action_unreblog">Annuler le partage</string>
     <string name="action_favourite">Favori</string>
     <string name="action_unfavourite">Supprimer le favori</string>
     <string name="action_more">Plus</string>
@@ -69,8 +69,8 @@
     <string name="action_unfollow">Ne plus suivre</string>
     <string name="action_block">Bloquer</string>
     <string name="action_unblock">Débloquer</string>
-    <string name="action_hide_reblogs">Cacher les boosts</string>
-    <string name="action_show_reblogs">Montrer les boosts</string>
+    <string name="action_hide_reblogs">Cacher les partages</string>
+    <string name="action_show_reblogs">Montrer les partages</string>
     <string name="action_report">Signaler</string>
     <string name="action_delete">Supprimer</string>
     <string name="action_send">POUET</string>
@@ -109,8 +109,8 @@
     <string name="action_links">Liens</string>
     <string name="action_mentions">Mentions</string>
     <string name="action_hashtags">Hashtags</string>
-    <string name="action_open_reblogger">Afficher l’auteur·rice du boost</string>
-    <string name="action_open_reblogged_by">Afficher les boosts</string>
+    <string name="action_open_reblogger">Afficher l’auteur·rice du partage</string>
+    <string name="action_open_reblogged_by">Montrer les partages</string>
     <string name="action_open_faved_by">Montrer les favoris</string>
     <string name="title_hashtags_dialog">Hashtags</string>
     <string name="title_mentions_dialog">Mentions</string>
@@ -170,7 +170,7 @@
     <string name="pref_title_notification_filters">Me notifier lorsque</string>
     <string name="pref_title_notification_filter_mentions">on me mentionne</string>
     <string name="pref_title_notification_filter_follows">on me suit</string>
-    <string name="pref_title_notification_filter_reblogs">mes messages sont boostés</string>
+    <string name="pref_title_notification_filter_reblogs">mes pouets sont partagés</string>
     <string name="pref_title_notification_filter_favourites">mes messages sont mis en favoris</string>
     <string name="pref_title_appearance_settings">Apparence</string>
     <string name="pref_title_app_theme">Thème de l’application</string>
@@ -187,7 +187,7 @@
     <string name="pref_title_language">Langue</string>
     <string name="pref_title_status_filter">Filtrage des fils</string>
     <string name="pref_title_status_tabs">Onglets</string>
-    <string name="pref_title_show_boosts">Afficher les boosts</string>
+    <string name="pref_title_show_boosts">Montrer les partages</string>
     <string name="pref_title_show_replies">Afficher les réponses</string>
     <string name="pref_title_show_media_preview">Montrer les miniatures des médias</string>
     <string name="pref_title_proxy_settings">Proxy</string>
@@ -213,7 +213,7 @@
     <string name="notification_follow_name">Nouveaux abonnés</string>
     <string name="notification_follow_description">Notifications pour les nouveaux abonnés</string>
     <string name="notification_boost_name">Partages</string>
-    <string name="notification_boost_description">Notifications quand vos pouets sont boostés</string>
+    <string name="notification_boost_description">Notifications quand vos pouets sont partagés</string>
     <string name="notification_favourite_name">Favoris</string>
     <string name="notification_favourite_description">Notifications quand vos pouets sont mis en favoris</string>
     <string name="notification_mention_format">%s vous a mentionné</string>
@@ -316,8 +316,8 @@
     <string name="download_failed">Échec du téléchargement</string>
     <string name="profile_badge_bot_text">Robot</string>
     <string name="account_moved_description">%1$s a déménagé vers :</string>
-    <string name="reblog_private">Booster vers l’audience originale</string>
-    <string name="unreblog_private">Ne plus booster</string>
+    <string name="reblog_private">Partager à l’audience originale</string>
+    <string name="unreblog_private">Annuler le partage</string>
     <string name="license_description">Tusky contient du code et des ressources issus des projets open source suivants :</string>
     <string name="license_apache_2">Sous licence Apache (copie ci-dessous)</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
@@ -335,10 +335,10 @@
 	<item quantity="other"><b>%1$s</b> Favoris</item>
 </plurals>
     <plurals name="reblogs">
-        <item quantity="one">&lt;b&gt;%s&lt;/b&gt; Boost</item>
-        <item quantity="other">&lt;b&gt;%s&lt;/b&gt; Boosts</item>
-    </plurals>
-    <string name="title_reblogged_by">Boosté par</string>
+	<item quantity="one"><b>%s</b> Partage</item>
+	<item quantity="other"><b>%s</b> Partages</item>
+</plurals>
+    <string name="title_reblogged_by">Partagé par</string>
     <string name="title_favourited_by">Mis en favoris par</string>
     <string name="conversation_1_recipients">%1$s</string>
     <string name="conversation_2_recipients">%1$s et %2$s</string>

From d974f474088f09bc3f6c5f75107a93fbad289bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sveinn=20=C3=AD=20Felli?= <sv1@fellsnet.is>
Date: Fri, 6 Mar 2020 11:27:22 +0000
Subject: [PATCH 19/42] Translated using Weblate (Icelandic)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/is/
---
 app/src/main/res/values-is/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 12e3dac2d..4bbd56dc8 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -508,4 +508,6 @@
     <string name="no_scheduled_status">Þú ert ekki með neinar áætlaðar stöðufærslur.</string>
 
 <string name="error_audio_upload_size">Hljóðskrár verða að vera minni en 40MB.</string>
-    </resources>
+    <string name="warning_scheduling_interval">Mastodon er með 5 mínútna lágmarksbil fyrir áætlaðar aðgerðir.</string>
+
+</resources>

From 91dd3e4f5f47d10b4647c9599f965e23be91a0bc Mon Sep 17 00:00:00 2001
From: Daniele Lira Mereb <danielelmereb@gmail.com>
Date: Fri, 6 Mar 2020 11:27:22 +0000
Subject: [PATCH 20/42] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/pt_BR/
---
 app/src/main/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 41370ef78..781895312 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -486,4 +486,5 @@
 
 <string name="error_audio_upload_size">Áudios devem ser menores que 40MB.</string>
     <string name="no_saved_status">Sem rascunhos.</string>
+    <string name="warning_scheduling_interval">Mastodon possui um intervalo mínimo de 5 minutos para agendar.</string>
     </resources>

From 6a87e3e35295a2b14086b737741f8ae0b80b0462 Mon Sep 17 00:00:00 2001
From: Ivan Kupalov <charlag@tuta.io>
Date: Mon, 9 Mar 2020 20:43:01 +0100
Subject: [PATCH 21/42] Work around the bug in ComposeScheduleView, fix #1720
 (#1722)

DatePicker seems to think that it's in UTC. So setting selected time
might not work as aspect and receiving value from it might be in UTC
as well. This commit fixes the second issue by interpreting the date
as UTC date. Tested with America/New_York (GMT-5 at the moment) and
Russia/Kamchatka (GMT+12).
---
 .../tusky/components/compose/view/ComposeScheduleView.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.java b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.java
index 0deb20be7..ca6639369 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.java
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeScheduleView.java
@@ -192,6 +192,9 @@ public class ComposeScheduleView extends ConstraintLayout {
     private void onDateSet(long selection) {
         initializeSuggestedTime();
         Calendar newDate = getCalendar();
+        // working around bug in DatePicker where date is UTC #1720
+        // see https://github.com/material-components/material-components-android/issues/882
+        newDate.setTimeZone(TimeZone.getTimeZone("UTC"));
         newDate.setTimeInMillis(selection);
         scheduleDateTime.set(newDate.get(Calendar.YEAR), newDate.get(Calendar.MONTH), newDate.get(Calendar.DATE));
         openPickTimeDialog();

From f67d6b4f7f298075ed5290e623ec506b84af37ff Mon Sep 17 00:00:00 2001
From: ButterflyOfFire <butterflyoffire@protonmail.com>
Date: Sun, 15 Mar 2020 21:14:00 +0000
Subject: [PATCH 22/42] Translated using Weblate (Kabyle)

Currently translated at 59.5% (244 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/

Translated using Weblate (Kabyle)

Currently translated at 59.5% (244 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/kab/

Translated using Weblate (Chinese (Traditional))

Currently translated at 88.5% (363 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/zh_Hant/

Translated using Weblate (Chinese (Hong Kong))

Currently translated at 82.7% (339 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/zh_Hant_HK/

Translated using Weblate (Chinese)

Currently translated at 82.7% (339 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/zh_MO/

Translated using Weblate (Arabic)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ar/
---
 app/src/main/res/values-ar/strings.xml     | 110 ++++++++++-----------
 app/src/main/res/values-kab/strings.xml    |  14 ++-
 app/src/main/res/values-zh-rHK/strings.xml |   2 +-
 app/src/main/res/values-zh-rMO/strings.xml |   2 +-
 app/src/main/res/values-zh-rTW/strings.xml |   2 +-
 5 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index c40e7585c..b54b278a9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2,82 +2,82 @@
 <resources>
     <string name="error_generic">وقع هناك خطأ.</string>
     <string name="error_network">حدث خطأ في الشبكة! يرجى التحقق من اتصالك ثم أعد المحاولة!</string>
-    <string name="error_empty">لا يجب أن يترك فارغا.</string>
-    <string name="error_invalid_domain">اسم النطاق غير صالح</string>
+    <string name="error_empty">لا يجب أن يترك هذا الحقل فارغا.</string>
+    <string name="error_invalid_domain">اسم النطاق الذي قمتَ بإدخاله غير صالح</string>
     <string name="error_failed_app_registration">اخفقت المصادقة مع مثيل الخادم هذا.</string>
-    <string name="error_no_web_browser_found">تعذر العثور على متصفح ويب قابل للإستعمال.</string>
+    <string name="error_no_web_browser_found">تعذر العثور على متصفح ويب صالح للإستعمال.</string>
     <string name="error_authorization_unknown">لقد وقع هناك خطأ مجهول في التصريح.</string>
     <string name="error_authorization_denied">تم رفض التصريح.</string>
-    <string name="error_retrieving_oauth_token">فشل الحصول على رمز الدخول.</string>
-    <string name="error_compose_character_limit">المنشور طويل جدا !</string>
-    <string name="error_image_upload_size">يجب أن يكون حجم الملف أقل من 4 ميغابايت.</string>
+    <string name="error_retrieving_oauth_token">فشل الحصول على رمز الولوج.</string>
+    <string name="error_compose_character_limit">إنّ المنشور طويل جدا!</string>
+    <string name="error_image_upload_size">يجب أن يكون حجم الملف أقل من 8 ميغابايت.</string>
     <string name="error_video_upload_size">يجب أن يكون حجم ملفات الفيديو أقل من 40 ميغا بايت.</string>
-    <string name="error_media_upload_type">لا يمكن رفع هذا النوع من الملفات.</string>
+    <string name="error_media_upload_type">لا يمكن تحميل هذا النوع من الملفات.</string>
     <string name="error_media_upload_opening">تعذر فتح ذاك الملف.</string>
     <string name="error_media_upload_permission">التصريح لازم لقراءة الوسائط.</string>
     <string name="error_media_download_permission">التصريح لازم للإحتفاظ بالوسائط.</string>
-    <string name="error_media_upload_image_or_video">لا يمكنك إرفاق كلا من الصور و الفيديوهات في نفس المنشور.</string>
+    <string name="error_media_upload_image_or_video">لا يمكنك إرفاق كلا من الصور والفيديوهات في نفس المنشور في آن واحد.</string>
     <string name="error_media_upload_sending">اخفقت عملية الرفع.</string>
     <string name="error_sender_account_gone">خطأ عند إرسال التبويق.</string>
-    <string name="title_home">الرئيسية</string>
+    <string name="title_home">الرئيسي</string>
     <string name="title_notifications">الاشعارات</string>
-    <string name="title_public_local">المحلية</string>
-    <string name="title_public_federated">الفدرالية</string>
+    <string name="title_public_local">المحلي</string>
+    <string name="title_public_federated">الفدرالي</string>
     <string name="title_direct_messages">الرسائل المباشرة</string>
     <string name="title_tab_preferences">الألسنة</string>
     <string name="title_view_thread">تبويق</string>
-    <string name="title_statuses">المشاركات</string>
-    <string name="title_statuses_with_replies">يحتوي على ردود</string>
-    <string name="title_statuses_pinned">مدبّس</string>
+    <string name="title_statuses">المنشورات</string>
+    <string name="title_statuses_with_replies">التبويقات والردود</string>
+    <string name="title_statuses_pinned">المدبّسة</string>
     <string name="title_follows">المتابَعون</string>
     <string name="title_followers">المتابِعون</string>
     <string name="title_favourites">المفضلة</string>
     <string name="title_mutes">الحسابات المكتومة</string>
     <string name="title_blocks">الحسابات المحظورة</string>
     <string name="title_follow_requests">طلبات المتابعة</string>
-    <string name="title_edit_profile">عدل ملفك الشخصي</string>
+    <string name="title_edit_profile">عدل ملفك التعريفي</string>
     <string name="title_saved_toot">المسودات</string>
     <string name="title_licenses">الرّخص</string>
     <string name="status_username_format">\@%s</string>
-    <string name="status_boosted_format">%s رقّي</string>
+    <string name="status_boosted_format">شارَكَه %s</string>
     <string name="status_sensitive_media_title">محتوى حساس</string>
     <string name="status_media_hidden_title">وسائط مخفية</string>
     <string name="status_sensitive_media_directions">اضغط للعرض</string>
-    <string name="status_content_warning_show_more">اعرض أكثر</string>
+    <string name="status_content_warning_show_more">اعرض المزيد</string>
     <string name="status_content_warning_show_less">اعرض أقل</string>
     <string name="status_content_show_more">توسيع</string>
     <string name="status_content_show_less">تصغير</string>
     <string name="message_empty">لا شيء هنا.</string>
-    <string name="footer_empty">لا يوجد شيئ هنا. إسحب إلى أسفل للتحديث !</string>
-    <string name="notification_reblog_format">رقّى %s تبويقك</string>
+    <string name="footer_empty">لا يوجد شيء هنا. إسحب إلى أسفل للإنعاش!</string>
+    <string name="notification_reblog_format">شارَك %s تبويقك</string>
     <string name="notification_favourite_format">أعجِب %s بتبويقك</string>
     <string name="notification_follow_format">%s يتبعك</string>
     <string name="report_username_format">أبلغ عن @%s</string>
-    <string name="report_comment_hint">تعليقات إضافية ؟</string>
-    <string name="action_quick_reply">إجابة سريعة</string>
-    <string name="action_reply">أجب</string>
+    <string name="report_comment_hint">تعليقات إضافية؟</string>
+    <string name="action_quick_reply">رد سريع</string>
+    <string name="action_reply">رد</string>
     <string name="action_reblog">رقّي</string>
     <string name="action_unreblog">إزالة الترقية</string>
     <string name="action_favourite">تفضيل</string>
     <string name="action_unfavourite">إزالة المفضلة</string>
     <string name="action_more">المزيد</string>
     <string name="action_compose">حرر</string>
-    <string name="action_login">التسجيل بواسطة ماستدون</string>
+    <string name="action_login">الولوج إلى ماستدون</string>
     <string name="action_logout">خروج</string>
-    <string name="action_logout_confirm">متأكد مِن أنك تود الخروج من الحساب %1$s ؟</string>
+    <string name="action_logout_confirm">متأكد مِن أنك تود الخروج من الحساب %1$s؟</string>
     <string name="action_follow">إتبع</string>
-    <string name="action_unfollow">إلغاء التتبع</string>
+    <string name="action_unfollow">إلغاء المتابعة</string>
     <string name="action_block">قم بحظره</string>
     <string name="action_unblock">إلغاء الحظر</string>
     <string name="action_hide_reblogs">إخفاء الترقيات</string>
     <string name="action_show_reblogs">إظهار الترقيات</string>
-    <string name="action_report">أبلغ</string>
+    <string name="action_report">أبلغ عنه</string>
     <string name="action_delete">إحذف</string>
     <string name="action_send">بَوّق</string>
     <string name="action_send_public">بوّق!</string>
-    <string name="action_retry">إعادة المحاولة</string>
+    <string name="action_retry">أعد المحاولة</string>
     <string name="action_close">إغلاق</string>
-    <string name="action_view_profile">الملف الشخصي</string>
+    <string name="action_view_profile">الملف التعريفي</string>
     <string name="action_view_preferences">التفضيلات</string>
     <string name="action_view_account_preferences">تفضيلات الحساب</string>
     <string name="action_view_favourites">المفضلة</string>
@@ -95,7 +95,7 @@
     <string name="action_hide_media">إخفاء الوسائط</string>
     <string name="action_open_drawer">إفتح الدرج</string>
     <string name="action_save">إحفظ</string>
-    <string name="action_edit_profile">تعديل الملف الشخصي</string>
+    <string name="action_edit_profile">تعديل الملف التعريفي</string>
     <string name="action_edit_own_profile">تعديل</string>
     <string name="action_undo">إلغاء</string>
     <string name="action_accept">موافقة</string>
@@ -109,8 +109,8 @@
     <string name="action_links">الروابط</string>
     <string name="action_mentions">الإشارات</string>
     <string name="action_hashtags">الوسوم</string>
-    <string name="action_open_reblogged_by">عرض الترقيات</string>
-    <string name="action_open_faved_by">عرض المفضلات</string>
+    <string name="action_open_reblogged_by">اعرض الترقيات</string>
+    <string name="action_open_faved_by">اعرض المفضلات</string>
     <string name="title_hashtags_dialog">الوسوم</string>
     <string name="title_mentions_dialog">الإشارات</string>
     <string name="title_links_dialog">الروابط</string>
@@ -120,23 +120,23 @@
     <string name="action_share_as">شاركه كـ…</string>
     <string name="send_status_link_to">شارك رابط التبويق مع…</string>
     <string name="send_status_content_to">شارك التبويق على…</string>
-    <string name="send_media_to">شارك رابط التبويق مع…</string>
-    <string name="confirmation_reported">تم الإرسال !</string>
+    <string name="send_media_to">شارك الوسيط مع…</string>
+    <string name="confirmation_reported">تم إرساله!</string>
     <string name="confirmation_unblocked">تم فك الحجب عن الحساب</string>
-    <string name="confirmation_unmuted">تم فك الكتم عن الحساب</string>
-    <string name="status_sent">تم إرساله !</string>
+    <string name="confirmation_unmuted">لم يعد الحساب مكتومًا</string>
+    <string name="status_sent">تم إرساله!</string>
     <string name="status_sent_long">تم إرسال الرد بنجاح.</string>
-    <string name="hint_domain">أي سيرفر ؟</string>
-    <string name="hint_compose">ما الجديد ؟</string>
+    <string name="hint_domain">أي مثيل خادم؟</string>
+    <string name="hint_compose">ما الجديد؟</string>
     <string name="hint_content_warning">تحذير عن المحتوى</string>
     <string name="hint_display_name">الإسم العلني</string>
     <string name="hint_note">السيرة</string>
     <string name="hint_search">البحث عن…</string>
-    <string name="search_no_results">لم يتم العثور على نتائج</string>
-    <string name="label_quick_reply">إجابة …</string>
-    <string name="label_avatar">الصورة الرمزية</string>
-    <string name="label_header">رأس الصفحة</string>
-    <string name="link_whats_an_instance">ماذا نعني بمثيل الخادم ؟</string>
+    <string name="search_no_results">لم يتم العثور على أية نتائج</string>
+    <string name="label_quick_reply">رد…</string>
+    <string name="label_avatar">صورة الملف التعريفي</string>
+    <string name="label_header">صورة رأس الصفحة</string>
+    <string name="link_whats_an_instance">ماذا نعني بمثيل الخادم؟</string>
     <string name="login_connection">الإتصال جارٍ…</string>
     <string name="dialog_whats_an_instance">بإمكانك إدخال عنوان أي مثيل خادوم ماستدون هنا. على سبيل المثال mastodon.social أو icosahedron.website أو social.tchncs.de أوالإطلاع على <a href="https://instances.social">لاكتشاف المزيد !</a> 
 \n 
@@ -148,13 +148,13 @@
     <string name="dialog_title_finishing_media_upload">تتمة رفع الوسائط</string>
     <string name="dialog_message_uploading_media">الإرسال جارٍ…</string>
     <string name="dialog_download_image">تنزيل</string>
-    <string name="dialog_message_cancel_follow_request">هل تريد رفض طلب المتابعة ؟</string>
-    <string name="dialog_unfollow_warning">هل تود إلغاء متابعة هذا الحساب ؟</string>
+    <string name="dialog_message_cancel_follow_request">هل تريد رفض طلب المتابعة؟</string>
+    <string name="dialog_unfollow_warning">هل تود إلغاء متابعة هذا الحساب؟</string>
     <string name="dialog_delete_toot_warning">هل تريد حذف هذا التبويق؟</string>
-    <string name="visibility_public">عمومي : ينشر على الخيوط العمومية</string>
-    <string name="visibility_unlisted">غير مدرج : لا يُعرَض على الخيوط العمومية</string>
-    <string name="visibility_private">لمتابعيك فقط : يُنشر إلى متابعيك فقط</string>
-    <string name="visibility_direct">مباشر : يُنشر إلى المستخدمين المشار إليهم فقط</string>
+    <string name="visibility_public">للعامة: ينشر على الخيوط العمومية</string>
+    <string name="visibility_unlisted">غير مدرج: لا يُعرَض على الخيوط العمومية</string>
+    <string name="visibility_private">لمتابعيك فقط: يُنشر إلى متابعيك فقط</string>
+    <string name="visibility_direct">مباشر: يُنشر إلى المستخدمين المشار إليهم فقط</string>
     <string name="pref_title_edit_notification_settings">تعديل الاشعارات</string>
     <string name="pref_title_notifications_enabled">الإخطارات</string>
     <string name="pref_title_notification_alerts">التنبيهات</string>
@@ -163,12 +163,12 @@
     <string name="pref_title_notification_alert_light">إعلام بالضوء</string>
     <string name="pref_title_notification_filters">أخطرني عندما</string>
     <string name="pref_title_notification_filter_mentions">يشار إلي</string>
-    <string name="pref_title_notification_filter_follows">يتبعني أحد</string>
+    <string name="pref_title_notification_filter_follows">يتبعني أحدهم</string>
     <string name="pref_title_notification_filter_reblogs">تُرقّى منشوراتي</string>
-    <string name="pref_title_notification_filter_favourites">أعجب أحد ما بمنشوراتي</string>
+    <string name="pref_title_notification_filter_favourites">يُعجَب أحد ما بمنشوراتي</string>
     <string name="pref_title_appearance_settings">المظهر</string>
-    <string name="pref_title_app_theme">سمة التطبيق</string>
-    <string name="pref_title_timelines">الخيوط</string>
+    <string name="pref_title_app_theme">حُلّة التطبيق</string>
+    <string name="pref_title_timelines">الخيوط الزمنية</string>
     <string name="pref_title_timeline_filters">عوامل التصفية</string>
     <string name="app_them_dark">داكنة</string>
     <string name="app_theme_light">فاتحة</string>
@@ -339,7 +339,7 @@
     <string name="action_open_reblogger">إظهار صاحب الترقية</string>
     <string name="action_open_media_n">افتح الوسيط #%d</string>
 
-    <string name="download_media">تنزيل الوسائط</string>
+    <string name="download_media">نزّل الوسائط</string>
     <string name="downloading_media">جارٍ تنزيل الوسائط</string>
 
     <string name="dialog_redraft_toot_warning">هل تريد حذف وإعادة صياغة هذا التبويق؟</string>
@@ -378,7 +378,7 @@
     <string name="poll_ended_created">لقد انتهى استطلاع رأي قمتَ بإنشائه</string>
 
 
-<string name="pref_title_notification_filter_poll">انتهت استطلاعات الرأي</string>
+<string name="pref_title_notification_filter_poll">تنتهي استطلاعات الرأي</string>
     <plurals name="favs">
 	<item quantity="zero"><b>%1$s</b>"  مفضلة"</item>
 	<item quantity="one"><b>%1$s</b> مفضلة</item>
@@ -457,7 +457,7 @@
 <string name="filter_dialog_whole_word">الكلمة كاملة</string>
     <string name="description_poll">استطلاع رأي بالخيارات: %1$s, %2$s, %3$s, %4$s; %5$s</string>
 
-    <string name="mute_domain_warning">هل أنت متأكد من أنك تريد حجب كافة %s ؟ سوف لن يكون باستطاعتك رؤية أي محتوى قادم من هذا النطاق بعد الآن ، لا في الخيوط الزمنية العامة ولا في إخطاراتك. سيتم إزالة متابِعيك الذين هم على هذا النطاق.</string>
+    <string name="mute_domain_warning">هل أنت متأكد من أنك تريد حجب كافة %s؟ سوف لن يكون باستطاعتك رؤية أي محتوى قادم من هذا النطاق بعد الآن ، لا في الخيوط الزمنية العامة ولا في إخطاراتك. سيتم إزالة متابِعيك الذين هم على هذا النطاق.</string>
     <string name="report_description_1">سيتم إرسال التقرير إلى مشرفي خادمك. يمكنك تقديم تفسير عن سبب الإبلاغ عن الحساب أدناه:</string>
     <string name="report_description_remote_instance">هذا الحساب ينتسب إلى خادم آخر. هل تريد إرسال نسخة مجهولة من التقرير إلى هناك أيضا؟</string>
 
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index b91bee1ed..07b6d44e8 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -109,13 +109,13 @@
     <string name="pin_action">Senṭeḍ</string>
 
     <string name="action_view_mutes">Imiḍanen yettwasgugmen</string>
-    <string name="action_view_blocks">Imiḍanen yettusḥebsen</string>
+    <string name="action_view_blocks">Imiḍan yettwacekklen</string>
     <string name="action_view_domain_mutes">Tiɣula yettwaffren</string>
     <string name="action_view_follow_requests">Isuturen n teḍfeṛt</string>
     <string name="action_view_media">Taɣwalt</string>
     <string name="notifications_clear">Sfeḍ</string>
     <string name="title_mutes">Imiḍanen yettwasgugmen</string>
-    <string name="title_blocks">Imiḍanen yettusḥebsen</string>
+    <string name="title_blocks">Imiḍanen yettwacekklen</string>
     <string name="title_domain_mutes">Tiɣula yettwaffren</string>
     <string name="title_follow_requests">Isuturen n teḍfeṛt</string>
     <string name="pref_title_notifications_enabled">Tilɣa</string>
@@ -150,7 +150,7 @@
     <string name="title_accounts">Imiḍanen</string>
     <string name="add_poll_choice">Rnu yiwen wefran</string>
     <string name="report_username_format">Ccetki ɣef @%s</string>
-    <string name="action_report">Ccetki</string>
+    <string name="action_report">Ccetki fell-as</string>
     <string name="action_reject">Ggami</string>
     <string name="download_image">Yessidired %1$s</string>
 
@@ -277,8 +277,8 @@
     <string name="title_licenses">Turagin</string>
 
     <string name="status_boosted_format">Yebḍa-t %s</string>
-    <string name="notification_reblog_format">Yebḍa %s tijewwiqt-ik·im</string>
-    <string name="notification_favourite_format">Yerna %s tijewwiqt-ik·im ɣer imenyafen-is</string>
+    <string name="notification_reblog_format">%s Y·Tebḍa tijewwiqt-ik·im</string>
+    <string name="notification_favourite_format">%s Y·Terna tijewwiqt-ik·im ɣer imenyafen-is</string>
     <string name="action_quick_reply">Tiririt taruradt</string>
     <string name="action_reblog">Bḍu</string>
     <string name="action_unreblog">Kkes beṭu</string>
@@ -295,4 +295,8 @@
     <string name="hint_note">Assisen</string>
     <string name="label_header">Tugna n yiɣef n umaɣnu</string>
 
+    <string name="error_empty">Ur ilaq ara ad yili d ilem.</string>
+    <string name="action_block">Cekkel</string>
+    <string name="action_unblock">Kkes tacekkalt</string>
+    <string name="confirmation_unblocked">Tettwakkes tacekkalt ɣef umiḍan-nni</string>
     </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 3311a2bbb..b945f5145 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -161,7 +161,7 @@
 
     <string name="login_connection">正在連線…</string>
 
-    <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
+    <string name="dialog_whats_an_instance">"請輸入你帳號所在的 Mastodon 站點的域名或地址 "</string>
 
 
 
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index 3311a2bbb..b945f5145 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -161,7 +161,7 @@
 
     <string name="login_connection">正在連線…</string>
 
-    <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
+    <string name="dialog_whats_an_instance">"請輸入你帳號所在的 Mastodon 站點的域名或地址 "</string>
 
 
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a41e19148..506c24eca 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -161,7 +161,7 @@
 
     <string name="login_connection">正在連線…</string>
 
-    <string name="dialog_whats_an_instance">請輸入你帳號所在的 Mastodon 站點的域名或地址</string>
+    <string name="dialog_whats_an_instance">"請輸入你帳號所在的 Mastodon 站點的域名或地址 "</string>
 
 
     <string name="dialog_title_finishing_media_upload">正在完成上傳…</string>

From 62dbb752008cde1dfafcb5e770ed7ad9a659aae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isak=20Holmstr=C3=B6m?= <iah@ghostly.solutions>
Date: Sun, 15 Mar 2020 21:14:00 +0000
Subject: [PATCH 23/42] Translated using Weblate (Swedish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
---
 app/src/main/res/values-sv/strings.xml | 42 +++++++++++++-------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4bb611c69..f23ca5b12 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -20,7 +20,7 @@
     <string name="error_media_upload_sending">Uppladdningen misslyckades.</string>
     <string name="error_sender_account_gone">Kunde inte skicka toot.</string>
     <string name="title_home">Hem</string>
-    <string name="title_notifications">Notifikationer</string>
+    <string name="title_notifications">Aviseringar</string>
     <string name="title_public_local">Lokalt</string>
     <string name="title_public_federated">Federerat</string>
     <string name="title_direct_messages">Direkta meddelanden</string>
@@ -158,15 +158,15 @@
     <string name="visibility_unlisted">Olistad: Visa inte i offentliga tidslinjer</string>
     <string name="visibility_private">Enbart-följare: Ses enbart av följare</string>
     <string name="visibility_direct">Direkt: Skicka endast till nämnda användare</string>
-    <string name="pref_title_edit_notification_settings">Notifikationer</string>
-    <string name="pref_title_notifications_enabled">Notifikationer</string>
+    <string name="pref_title_edit_notification_settings">Aviseringar</string>
+    <string name="pref_title_notifications_enabled">Aviseringar</string>
     <string name="pref_title_notification_alerts">Alarm</string>
     <string name="pref_title_notification_alert_sound">Meddela med ljud</string>
     <string name="pref_title_notification_alert_vibrate">Meddela med vibration</string>
     <string name="pref_title_notification_alert_light">Notifieringar med LED</string>
     <string name="pref_title_notification_filters">Meddela mig när</string>
     <string name="pref_title_notification_filter_mentions">omnämnd</string>
-    <string name="pref_title_notification_filter_follows">följande</string>
+    <string name="pref_title_notification_filter_follows">nya följare</string>
     <string name="pref_title_notification_filter_reblogs">mina inlägg är knuffade</string>
     <string name="pref_title_notification_filter_favourites">mina inlägg är favoriserade</string>
     <string name="pref_title_appearance_settings">Utseende</string>
@@ -206,13 +206,13 @@
     <string name="status_text_size_large">Stor</string>
     <string name="status_text_size_largest">Största</string>
     <string name="notification_mention_name">Nya omnämnanden</string>
-    <string name="notification_mention_descriptions">Notifieringar om nya omnämnanden</string>
+    <string name="notification_mention_descriptions">Aviseringar om nya omnämnanden</string>
     <string name="notification_follow_name">Nya följare</string>
-    <string name="notification_follow_description">Notifieringar om nya följare</string>
+    <string name="notification_follow_description">Aviseringar på nya följare</string>
     <string name="notification_boost_name">Knuffar</string>
-    <string name="notification_boost_description">Notifieringar när dina toots blir knuffade</string>
+    <string name="notification_boost_description">Aviseringar när dina toots blir knuffade</string>
     <string name="notification_favourite_name">Favoriter</string>
-    <string name="notification_favourite_description">Notifieringar när dina toots blir markerade som favoriter</string>
+    <string name="notification_favourite_description">Aviseringar när dina toots blir markerade som favoriter</string>
     <string name="notification_mention_format">%s omnämnde dig</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s och %4$d andra</string>
     <string name="notification_summary_medium">%1$s, %2$s, och %3$s</string>
@@ -239,7 +239,7 @@
     <string name="status_share_link">Dela länk till toot</string>
     <string name="status_media_images">Bilder</string>
     <string name="status_media_video">Video</string>
-    <string name="state_follow_requested">Följarförfrågad</string>
+    <string name="state_follow_requested">Följarförfrågan</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="abbreviated_in_years">om %dy</string>
     <string name="abbreviated_in_days">om %dd</string>
@@ -272,9 +272,9 @@
     <string name="error_rename_list">Kunde inte byta namn på lista</string>
     <string name="error_delete_list">Kunde inte radera lista</string>
     <string name="action_create_list">Skapa en lista</string>
-    <string name="action_rename_list">Byt namn</string>
-    <string name="action_delete_list">Ta bort</string>
-    <string name="action_edit_list">Ändra</string>
+    <string name="action_rename_list">Byt namn på listan</string>
+    <string name="action_delete_list">Ta bort listan</string>
+    <string name="action_edit_list">Redigera lista</string>
     <string name="hint_search_people_list">Sök efter personer du följer</string>
     <string name="action_add_to_list">Lägg till konto i listan</string>
     <string name="action_remove_from_list">Ta bort kontot från listan</string>
@@ -305,7 +305,7 @@
     <string name="later">Senare</string>
     <string name="restart">Starta om</string>
     <string name="caption_systememoji">Standard-emojis för din enhet</string>
-    <string name="caption_blobmoji">Emojis baserade på The Blob emojis kända från Android 4.4–7.1</string>
+    <string name="caption_blobmoji">Emojis baserade på The Blob emojis från Android 4.4–7.1</string>
     <string name="caption_twemoji">Mastodon\'s standard emojis</string>
     <string name="download_failed">Nedladdning misslyckad</string>
     <string name="profile_badge_bot_text">Robot</string>
@@ -373,9 +373,9 @@
 
     <string name="pref_title_bot_overlay">Visa robotindikator</string>
 
-    <string name="notification_clear_text">Är du säker på att du vill rensa dina notifieringar permanent\?</string>
+    <string name="notification_clear_text">Är du säker på att du vill rensa dina aviseringar permanent\?</string>
 
-<string name="action_delete_and_redraft">Radera och skriv nytt</string>
+<string name="action_delete_and_redraft">Radera och skriv på nytt</string>
     <string name="dialog_redraft_toot_warning">Radera och skriv ny toot\?</string>
 
     <string name="poll_info_format"> <!-- 15 röster • 1 timme kvar --> %1$s • %2$s</string>
@@ -384,15 +384,15 @@
 	<item quantity="other">%s röster</item>
 </plurals>
     <string name="poll_info_time_relative">%s kvar</string>
-    <string name="poll_info_time_absolute">avslutas %s</string>
+    <string name="poll_info_time_absolute">avslutas vid %s</string>
     <string name="poll_info_closed">stängd</string>
 
     <string name="poll_vote">Rösta</string>
 
 
-<string name="pref_title_notification_filter_poll">omröstning är avslutad</string>
+<string name="pref_title_notification_filter_poll">omröstningar har avslutats</string>
     <string name="notification_poll_name">Omröstningar</string>
-    <string name="notification_poll_description">Notifieringar när omröstningar har avslutats</string>
+    <string name="notification_poll_description">Aviseringar när omröstningar har avslutats</string>
 
 
     <string name="poll_ended_voted">En omröstning där du har röstat är avslutad</string>
@@ -424,9 +424,9 @@
     <string name="title_domain_mutes">Dolda domäner</string>
     <string name="action_view_domain_mutes">Dolda domäner</string>
     <string name="action_mute_domain">Tysta %s</string>
-    <string name="confirmation_domain_unmuted">%s inte tystnad längre</string>
+    <string name="confirmation_domain_unmuted">%s inte tystad längre</string>
 
-    <string name="mute_domain_warning">Är du säker på att du vill blockera allt från %s\? Du kommer inte kunna se något innehåll från denna domän i publika tidslinje eller i dina notifieringar. Dina följare på domänen kommer inte att bli borttagna.</string>
+    <string name="mute_domain_warning">Är du säker på att du vill blockera allt från %s\? Du kommer inte kunna se något innehåll från denna domän i publika tidslinjer eller i dina notifieringar. Dina följare på domänen kommer inte att bli borttagna.</string>
     <string name="mute_domain_warning_dialog_ok">Dölj hela domänen</string>
 
     <string name="caption_notoemoji">Google\'s nuvarande emojis</string>
@@ -443,7 +443,7 @@
 
     <string name="pref_title_show_notifications_filter">Visa notifikationsfilter</string>
 <string name="filter_dialog_whole_word">Helt ord</string>
-    <string name="filter_dialog_whole_word_description">När nyckelordet eller frasen är alfanumerisk enbart, blir den enbart appliceras om den matchar hela ordet</string>
+    <string name="filter_dialog_whole_word_description">När nyckelordet eller frasen enbart är alfanumerisk, appliceras den om den matchar hela ordet</string>
     <string name="pref_title_alway_open_spoiler">Expandera alltid toots med innehållsvarningar</string>
     <string name="title_accounts">Konton</string>
     <string name="failed_search">Sökning misslyckades</string>

From 06eb308e93c23b76f5cd5de877688a9687d796c6 Mon Sep 17 00:00:00 2001
From: hg <victor+tusky.translate@hggqvst.com>
Date: Sun, 15 Mar 2020 21:14:00 +0000
Subject: [PATCH 24/42] Translated using Weblate (Swedish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/

Translated using Weblate (Swedish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/sv/
---
 app/src/main/res/values-sv/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index f23ca5b12..53f7308f0 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -177,7 +177,7 @@
     <string name="app_theme_light">Ljust</string>
     <string name="app_theme_black">Svart</string>
     <string name="app_theme_auto">Automatiskt vid solnedgång</string>
-    <string name="app_theme_system">Använd systemdesign</string>
+    <string name="app_theme_system">Använd system-tema</string>
     <string name="pref_title_browser_settings">Webbläsare</string>
     <string name="pref_title_custom_tabs">Använd Chrome-anpassade flikar</string>
     <string name="pref_title_hide_follow_button">Dölj skriv-knappen vid skrollning</string>
@@ -287,7 +287,7 @@
     <string name="lock_account_label_description">Kräver att du manuellt godkänner följare</string>
     <string name="compose_save_draft">Spara utkast?</string>
     <string name="send_toot_notification_title">Skickar toot…</string>
-    <string name="send_toot_notification_error_title">Fel vid sändning av toot</string>
+    <string name="send_toot_notification_error_title">Kunde inte skicka toot</string>
     <string name="send_toot_notification_channel_name">Skickar toot</string>
     <string name="send_toot_notification_cancel_title">Sändning avbruten</string>
     <string name="send_toot_notification_saved_content">En kopia av tooten har sparats i dina utkast</string>
@@ -298,7 +298,7 @@
     <string name="system_default">Systemstandard</string>
     <string name="download_fonts">Du behöver ladda ned dessa emojis först</string>
     <string name="performing_lookup_title">Utför sökning…</string>
-    <string name="expand_collapse_all_statuses">Expandera/Dölj alla status</string>
+    <string name="expand_collapse_all_statuses">Expandera/Dölj alla statusar</string>
     <string name="action_open_toot">Öppna toot</string>
     <string name="restart_required">Omstart av appen krävs</string>
     <string name="restart_emoji">Du måste starta om Tusky för att tillämpa ändringarna</string>

From 9c4898117e0d7a546d43d5ee92a7367d3ac337be Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Tue, 17 Mar 2020 19:46:32 +0100
Subject: [PATCH 25/42] Ensure media are marked sensitive any time there's a
 content warning (#1728)

Addresses the most critical part of #1725, and may also apply to #1721
---
 .../keylesspalace/tusky/components/compose/ComposeViewModel.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
index b8ade248a..fa6647984 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt
@@ -249,7 +249,7 @@ class ComposeViewModel
                             content,
                             spoilerText,
                             statusVisibility.value!!.serverString(),
-                            mediaUris.isNotEmpty() && markMediaAsSensitive.value!!,
+                            mediaUris.isNotEmpty() && (markMediaAsSensitive.value!! || showContentWarning.value!!),
                             mediaIds,
                             mediaUris.map { it.toString() },
                             mediaDescriptions,

From 43162789c1658249b27c1004ee9c1d7f4d62a26c Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Wed, 18 Mar 2020 17:12:56 +0100
Subject: [PATCH 26/42] upgrade Kotlin to 1.3.70 (#1730)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a71af6f14..38f3d2b41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.70'
     repositories {
         google()
         jcenter()

From 4a4dd4f30f7c3f6124795b4cb905fc2bae6ee4a0 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Thu, 19 Mar 2020 22:02:10 +0100
Subject: [PATCH 27/42] Add notifications for follow requests (#1729)

* Add notifications for follow requests
Issue #1719

* Revert item_follow_request layout, create new layout for follow request notifications

* Migrate follow request interaction from notification to observable pattern

* Filter follow request notifications by default

* Add missing cases for system notification generation

* Format code
---
 .../22.json                                   | 735 ++++++++++++++++++
 .../tusky/adapter/FollowRequestViewHolder.kt  |  51 ++
 .../tusky/adapter/FollowRequestsAdapter.java  |  60 +-
 .../tusky/adapter/NotificationsAdapter.java   |  26 +-
 .../keylesspalace/tusky/db/AccountEntity.kt   |   3 +-
 .../keylesspalace/tusky/db/AppDatabase.java   |  11 +-
 .../com/keylesspalace/tusky/di/AppModule.kt   |   2 +-
 .../tusky/entity/Notification.kt              |   3 +-
 .../tusky/fragment/NotificationsFragment.java |  31 +-
 .../NotificationPreferencesFragment.kt        |  54 +-
 .../tusky/network/MastodonApi.kt              |  10 +
 .../tusky/util/NotificationHelper.java        |  14 +-
 .../item_follow_request_notification.xml      |  96 +++
 app/src/main/res/values/strings.xml           |   4 +
 .../main/res/xml/notification_preferences.xml |   6 +
 .../tusky/ComposeActivityTest.kt              |   1 +
 16 files changed, 1003 insertions(+), 104 deletions(-)
 create mode 100644 app/schemas/com.keylesspalace.tusky.db.AppDatabase/22.json
 create mode 100644 app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt
 create mode 100644 app/src/main/res/layout/item_follow_request_notification.xml

diff --git a/app/schemas/com.keylesspalace.tusky.db.AppDatabase/22.json b/app/schemas/com.keylesspalace.tusky.db.AppDatabase/22.json
new file mode 100644
index 000000000..f5508a8d4
--- /dev/null
+++ b/app/schemas/com.keylesspalace.tusky.db.AppDatabase/22.json
@@ -0,0 +1,735 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 22,
+    "identityHash": "eaa3c4d012fe743948343983fe1ae493",
+    "entities": [
+      {
+        "tableName": "TootEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `text` TEXT, `urls` TEXT, `descriptions` TEXT, `contentWarning` TEXT, `inReplyToId` TEXT, `inReplyToText` TEXT, `inReplyToUsername` TEXT, `visibility` INTEGER, `poll` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "urls",
+            "columnName": "urls",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descriptions",
+            "columnName": "descriptions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "contentWarning",
+            "columnName": "contentWarning",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToId",
+            "columnName": "inReplyToId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToText",
+            "columnName": "inReplyToText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToUsername",
+            "columnName": "inReplyToUsername",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "visibility",
+            "columnName": "visibility",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "poll",
+            "columnName": "poll",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "uid"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AccountEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `domain` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `accountId` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `profilePictureUrl` TEXT NOT NULL, `notificationsEnabled` INTEGER NOT NULL, `notificationsMentioned` INTEGER NOT NULL, `notificationsFollowed` INTEGER NOT NULL, `notificationsFollowRequested` INTEGER NOT NULL, `notificationsReblogged` INTEGER NOT NULL, `notificationsFavorited` INTEGER NOT NULL, `notificationsPolls` INTEGER NOT NULL, `notificationSound` INTEGER NOT NULL, `notificationVibration` INTEGER NOT NULL, `notificationLight` INTEGER NOT NULL, `defaultPostPrivacy` INTEGER NOT NULL, `defaultMediaSensitivity` INTEGER NOT NULL, `alwaysShowSensitiveMedia` INTEGER NOT NULL, `alwaysOpenSpoiler` INTEGER NOT NULL, `mediaPreviewEnabled` INTEGER NOT NULL, `lastNotificationId` TEXT NOT NULL, `activeNotifications` TEXT NOT NULL, `emojis` TEXT NOT NULL, `tabPreferences` TEXT NOT NULL, `notificationsFilter` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accessToken",
+            "columnName": "accessToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isActive",
+            "columnName": "isActive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountId",
+            "columnName": "accountId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profilePictureUrl",
+            "columnName": "profilePictureUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsEnabled",
+            "columnName": "notificationsEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsMentioned",
+            "columnName": "notificationsMentioned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFollowed",
+            "columnName": "notificationsFollowed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFollowRequested",
+            "columnName": "notificationsFollowRequested",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsReblogged",
+            "columnName": "notificationsReblogged",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFavorited",
+            "columnName": "notificationsFavorited",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsPolls",
+            "columnName": "notificationsPolls",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationSound",
+            "columnName": "notificationSound",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationVibration",
+            "columnName": "notificationVibration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationLight",
+            "columnName": "notificationLight",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaultPostPrivacy",
+            "columnName": "defaultPostPrivacy",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaultMediaSensitivity",
+            "columnName": "defaultMediaSensitivity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alwaysShowSensitiveMedia",
+            "columnName": "alwaysShowSensitiveMedia",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alwaysOpenSpoiler",
+            "columnName": "alwaysOpenSpoiler",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mediaPreviewEnabled",
+            "columnName": "mediaPreviewEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastNotificationId",
+            "columnName": "lastNotificationId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeNotifications",
+            "columnName": "activeNotifications",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojis",
+            "columnName": "emojis",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tabPreferences",
+            "columnName": "tabPreferences",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFilter",
+            "columnName": "notificationsFilter",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AccountEntity_domain_accountId",
+            "unique": true,
+            "columnNames": [
+              "domain",
+              "accountId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_AccountEntity_domain_accountId` ON `${TABLE_NAME}` (`domain`, `accountId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InstanceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`instance` TEXT NOT NULL, `emojiList` TEXT, `maximumTootCharacters` INTEGER, `maxPollOptions` INTEGER, `maxPollOptionLength` INTEGER, `version` TEXT, PRIMARY KEY(`instance`))",
+        "fields": [
+          {
+            "fieldPath": "instance",
+            "columnName": "instance",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojiList",
+            "columnName": "emojiList",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumTootCharacters",
+            "columnName": "maximumTootCharacters",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maxPollOptions",
+            "columnName": "maxPollOptions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maxPollOptionLength",
+            "columnName": "maxPollOptionLength",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "instance"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimelineStatusEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`serverId` TEXT NOT NULL, `url` TEXT, `timelineUserId` INTEGER NOT NULL, `authorServerId` TEXT, `inReplyToId` TEXT, `inReplyToAccountId` TEXT, `content` TEXT, `createdAt` INTEGER NOT NULL, `emojis` TEXT, `reblogsCount` INTEGER NOT NULL, `favouritesCount` INTEGER NOT NULL, `reblogged` INTEGER NOT NULL, `bookmarked` INTEGER NOT NULL, `favourited` INTEGER NOT NULL, `sensitive` INTEGER NOT NULL, `spoilerText` TEXT, `visibility` INTEGER, `attachments` TEXT, `mentions` TEXT, `application` TEXT, `reblogServerId` TEXT, `reblogAccountId` TEXT, `poll` TEXT, PRIMARY KEY(`serverId`, `timelineUserId`), FOREIGN KEY(`authorServerId`, `timelineUserId`) REFERENCES `TimelineAccountEntity`(`serverId`, `timelineUserId`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "serverId",
+            "columnName": "serverId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timelineUserId",
+            "columnName": "timelineUserId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorServerId",
+            "columnName": "authorServerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToId",
+            "columnName": "inReplyToId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToAccountId",
+            "columnName": "inReplyToAccountId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojis",
+            "columnName": "emojis",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "reblogsCount",
+            "columnName": "reblogsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "favouritesCount",
+            "columnName": "favouritesCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "reblogged",
+            "columnName": "reblogged",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bookmarked",
+            "columnName": "bookmarked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "favourited",
+            "columnName": "favourited",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sensitive",
+            "columnName": "sensitive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spoilerText",
+            "columnName": "spoilerText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "visibility",
+            "columnName": "visibility",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "mentions",
+            "columnName": "mentions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "application",
+            "columnName": "application",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "reblogServerId",
+            "columnName": "reblogServerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "reblogAccountId",
+            "columnName": "reblogAccountId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "poll",
+            "columnName": "poll",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "serverId",
+            "timelineUserId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_TimelineStatusEntity_authorServerId_timelineUserId",
+            "unique": false,
+            "columnNames": [
+              "authorServerId",
+              "timelineUserId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TimelineStatusEntity_authorServerId_timelineUserId` ON `${TABLE_NAME}` (`authorServerId`, `timelineUserId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "TimelineAccountEntity",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "authorServerId",
+              "timelineUserId"
+            ],
+            "referencedColumns": [
+              "serverId",
+              "timelineUserId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TimelineAccountEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`serverId` TEXT NOT NULL, `timelineUserId` INTEGER NOT NULL, `localUsername` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `url` TEXT NOT NULL, `avatar` TEXT NOT NULL, `emojis` TEXT NOT NULL, `bot` INTEGER NOT NULL, PRIMARY KEY(`serverId`, `timelineUserId`))",
+        "fields": [
+          {
+            "fieldPath": "serverId",
+            "columnName": "serverId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timelineUserId",
+            "columnName": "timelineUserId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localUsername",
+            "columnName": "localUsername",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatar",
+            "columnName": "avatar",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojis",
+            "columnName": "emojis",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bot",
+            "columnName": "bot",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "serverId",
+            "timelineUserId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ConversationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountId` INTEGER NOT NULL, `id` TEXT NOT NULL, `accounts` TEXT NOT NULL, `unread` INTEGER NOT NULL, `s_id` TEXT NOT NULL, `s_url` TEXT, `s_inReplyToId` TEXT, `s_inReplyToAccountId` TEXT, `s_account` TEXT NOT NULL, `s_content` TEXT NOT NULL, `s_createdAt` INTEGER NOT NULL, `s_emojis` TEXT NOT NULL, `s_favouritesCount` INTEGER NOT NULL, `s_favourited` INTEGER NOT NULL, `s_bookmarked` INTEGER NOT NULL, `s_sensitive` INTEGER NOT NULL, `s_spoilerText` TEXT NOT NULL, `s_attachments` TEXT NOT NULL, `s_mentions` TEXT NOT NULL, `s_showingHiddenContent` INTEGER NOT NULL, `s_expanded` INTEGER NOT NULL, `s_collapsible` INTEGER NOT NULL, `s_collapsed` INTEGER NOT NULL, `s_poll` TEXT, PRIMARY KEY(`id`, `accountId`))",
+        "fields": [
+          {
+            "fieldPath": "accountId",
+            "columnName": "accountId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accounts",
+            "columnName": "accounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.id",
+            "columnName": "s_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.url",
+            "columnName": "s_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastStatus.inReplyToId",
+            "columnName": "s_inReplyToId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastStatus.inReplyToAccountId",
+            "columnName": "s_inReplyToAccountId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastStatus.account",
+            "columnName": "s_account",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.content",
+            "columnName": "s_content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.createdAt",
+            "columnName": "s_createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.emojis",
+            "columnName": "s_emojis",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.favouritesCount",
+            "columnName": "s_favouritesCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.favourited",
+            "columnName": "s_favourited",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.bookmarked",
+            "columnName": "s_bookmarked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.sensitive",
+            "columnName": "s_sensitive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.spoilerText",
+            "columnName": "s_spoilerText",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.attachments",
+            "columnName": "s_attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.mentions",
+            "columnName": "s_mentions",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.showingHiddenContent",
+            "columnName": "s_showingHiddenContent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.expanded",
+            "columnName": "s_expanded",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.collapsible",
+            "columnName": "s_collapsible",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.collapsed",
+            "columnName": "s_collapsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.poll",
+            "columnName": "s_poll",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "accountId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'eaa3c4d012fe743948343983fe1ae493')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt
new file mode 100644
index 000000000..d9fd0491e
--- /dev/null
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt
@@ -0,0 +1,51 @@
+package com.keylesspalace.tusky.adapter
+
+import android.view.View
+import androidx.core.text.BidiFormatter
+import androidx.preference.PreferenceManager
+import androidx.recyclerview.widget.RecyclerView
+import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.entity.Account
+import com.keylesspalace.tusky.interfaces.AccountActionListener
+import com.keylesspalace.tusky.util.CustomEmojiHelper
+import com.keylesspalace.tusky.util.loadAvatar
+import com.keylesspalace.tusky.util.visible
+import kotlinx.android.synthetic.main.item_follow_request_notification.view.*
+
+internal class FollowRequestViewHolder(itemView: View, private val showHeader: Boolean) : RecyclerView.ViewHolder(itemView) {
+    private var id: String? = null
+    private val animateAvatar: Boolean = PreferenceManager.getDefaultSharedPreferences(itemView.context)
+            .getBoolean("animateGifAvatars", false)
+
+    fun setupWithAccount(account: Account, formatter: BidiFormatter?) {
+        id = account.id
+        val wrappedName = formatter?.unicodeWrap(account.name) ?: account.name
+        val emojifiedName: CharSequence = CustomEmojiHelper.emojifyString(wrappedName, account.emojis, itemView)
+        itemView.displayNameTextView.text = emojifiedName
+        if (showHeader) {
+            itemView.notificationTextView.text = itemView.context.getString(R.string.notification_follow_request_format, emojifiedName)
+        }
+        itemView.notificationTextView.visible(showHeader)
+        val format = itemView.context.getString(R.string.status_username_format)
+        val formattedUsername = String.format(format, account.username)
+        itemView.usernameTextView.text = formattedUsername
+        val avatarRadius = itemView.avatar.context.resources.getDimensionPixelSize(R.dimen.avatar_radius_48dp)
+        loadAvatar(account.avatar, itemView.avatar, avatarRadius, animateAvatar)
+    }
+
+    fun setupActionListener(listener: AccountActionListener) {
+        itemView.acceptButton.setOnClickListener {
+            val position = adapterPosition
+            if (position != RecyclerView.NO_POSITION) {
+                listener.onRespondToFollowRequest(true, id, position)
+            }
+        }
+        itemView.rejectButton.setOnClickListener {
+            val position = adapterPosition
+            if (position != RecyclerView.NO_POSITION) {
+                listener.onRespondToFollowRequest(false, id, position)
+            }
+        }
+        itemView.avatar.setOnClickListener { listener.onViewAccount(id) }
+    }
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java
index 37f09f019..548d893c5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java
@@ -18,19 +18,12 @@ package com.keylesspalace.tusky.adapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.keylesspalace.tusky.R;
-import com.keylesspalace.tusky.entity.Account;
 import com.keylesspalace.tusky.interfaces.AccountActionListener;
-import com.keylesspalace.tusky.util.CustomEmojiHelper;
-import com.keylesspalace.tusky.util.ImageLoadingHelper;
 
 public class FollowRequestsAdapter extends AccountAdapter {
 
@@ -46,7 +39,7 @@ public class FollowRequestsAdapter extends AccountAdapter {
             case VIEW_TYPE_ACCOUNT: {
                 View view = LayoutInflater.from(parent.getContext())
                         .inflate(R.layout.item_follow_request, parent, false);
-                return new FollowRequestViewHolder(view);
+                return new FollowRequestViewHolder(view, false);
             }
             case VIEW_TYPE_FOOTER: {
                 View view = LayoutInflater.from(parent.getContext())
@@ -60,57 +53,8 @@ public class FollowRequestsAdapter extends AccountAdapter {
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
         if (getItemViewType(position) == VIEW_TYPE_ACCOUNT) {
             FollowRequestViewHolder holder = (FollowRequestViewHolder) viewHolder;
-            holder.setupWithAccount(accountList.get(position));
+            holder.setupWithAccount(accountList.get(position), null);
             holder.setupActionListener(accountActionListener);
         }
     }
-
-    static class FollowRequestViewHolder extends RecyclerView.ViewHolder {
-        private ImageView avatar;
-        private TextView username;
-        private TextView displayName;
-        private ImageButton accept;
-        private ImageButton reject;
-        private String id;
-        private boolean animateAvatar;
-
-        FollowRequestViewHolder(View itemView) {
-            super(itemView);
-            avatar = itemView.findViewById(R.id.avatar);
-            username = itemView.findViewById(R.id.usernameTextView);
-            displayName = itemView.findViewById(R.id.displayNameTextView);
-            accept = itemView.findViewById(R.id.acceptButton);
-            reject = itemView.findViewById(R.id.rejectButton);
-            animateAvatar = PreferenceManager.getDefaultSharedPreferences(itemView.getContext())
-                    .getBoolean("animateGifAvatars", false);
-        }
-
-        void setupWithAccount(Account account) {
-            id = account.getId();
-            CharSequence emojifiedName = CustomEmojiHelper.emojifyString(account.getName(), account.getEmojis(), displayName);
-            displayName.setText(emojifiedName);
-            String format = username.getContext().getString(R.string.status_username_format);
-            String formattedUsername = String.format(format, account.getUsername());
-            username.setText(formattedUsername);
-            int avatarRadius = avatar.getContext().getResources()
-                    .getDimensionPixelSize(R.dimen.avatar_radius_48dp);
-            ImageLoadingHelper.loadAvatar(account.getAvatar(), avatar, avatarRadius, animateAvatar);
-        }
-
-        void setupActionListener(final AccountActionListener listener) {
-            accept.setOnClickListener(v -> {
-                int position = getAdapterPosition();
-                if (position != RecyclerView.NO_POSITION) {
-                    listener.onRespondToFollowRequest(true, id, position);
-                }
-            });
-            reject.setOnClickListener(v -> {
-                int position = getAdapterPosition();
-                if (position != RecyclerView.NO_POSITION) {
-                    listener.onRespondToFollowRequest(false, id, position);
-                }
-            });
-            avatar.setOnClickListener(v -> listener.onViewAccount(id));
-        }
-    }
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
index b12bab338..ba8870b0b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
@@ -42,6 +42,7 @@ import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.entity.Account;
 import com.keylesspalace.tusky.entity.Emoji;
 import com.keylesspalace.tusky.entity.Notification;
+import com.keylesspalace.tusky.interfaces.AccountActionListener;
 import com.keylesspalace.tusky.interfaces.LinkListener;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.util.CardViewMode;
@@ -72,8 +73,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
     private static final int VIEW_TYPE_STATUS = 0;
     private static final int VIEW_TYPE_STATUS_NOTIFICATION = 1;
     private static final int VIEW_TYPE_FOLLOW = 2;
-    private static final int VIEW_TYPE_PLACEHOLDER = 3;
-    private static final int VIEW_TYPE_UNKNOWN = 4;
+    private static final int VIEW_TYPE_FOLLOW_REQUEST = 3;
+    private static final int VIEW_TYPE_PLACEHOLDER = 4;
+    private static final int VIEW_TYPE_UNKNOWN = 5;
 
     private static final InputFilter[] COLLAPSE_INPUT_FILTER = new InputFilter[]{SmartLengthInputFilter.INSTANCE};
     private static final InputFilter[] NO_INPUT_FILTER = new InputFilter[0];
@@ -82,6 +84,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
     private StatusDisplayOptions statusDisplayOptions;
     private StatusActionListener statusListener;
     private NotificationActionListener notificationActionListener;
+    private AccountActionListener accountActionListener;
     private BidiFormatter bidiFormatter;
     private AdapterDataSource<NotificationViewData> dataSource;
 
@@ -89,13 +92,15 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
                                 AdapterDataSource<NotificationViewData> dataSource,
                                 StatusDisplayOptions statusDisplayOptions,
                                 StatusActionListener statusListener,
-                                NotificationActionListener notificationActionListener) {
+                                NotificationActionListener notificationActionListener,
+                                AccountActionListener accountActionListener) {
 
         this.accountId = accountId;
         this.dataSource = dataSource;
         this.statusDisplayOptions = statusDisplayOptions;
         this.statusListener = statusListener;
         this.notificationActionListener = notificationActionListener;
+        this.accountActionListener = accountActionListener;
         bidiFormatter = BidiFormatter.getInstance();
     }
 
@@ -119,6 +124,11 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
                         .inflate(R.layout.item_follow, parent, false);
                 return new FollowViewHolder(view, statusDisplayOptions);
             }
+            case VIEW_TYPE_FOLLOW_REQUEST: {
+                View view = inflater
+                        .inflate(R.layout.item_follow_request_notification, parent, false);
+                return new FollowRequestViewHolder(view, true);
+            }
             case VIEW_TYPE_PLACEHOLDER: {
                 View view = inflater
                         .inflate(R.layout.item_status_placeholder, parent, false);
@@ -215,6 +225,13 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
                     }
                     break;
                 }
+                case VIEW_TYPE_FOLLOW_REQUEST: {
+                    if (payloadForHolder == null) {
+                        FollowRequestViewHolder holder = (FollowRequestViewHolder) viewHolder;
+                        holder.setupWithAccount(concreteNotificaton.getAccount(), bidiFormatter);
+                        holder.setupActionListener(accountActionListener);
+                    }
+                }
                 default:
             }
         }
@@ -258,6 +275,9 @@ public class NotificationsAdapter extends RecyclerView.Adapter {
                 case FOLLOW: {
                     return VIEW_TYPE_FOLLOW;
                 }
+                case FOLLOW_REQUEST: {
+                    return VIEW_TYPE_FOLLOW_REQUEST;
+                }
                 default: {
                     return VIEW_TYPE_UNKNOWN;
                 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/AccountEntity.kt b/app/src/main/java/com/keylesspalace/tusky/db/AccountEntity.kt
index e4948c3d0..77ce16ccb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/AccountEntity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/AccountEntity.kt
@@ -39,6 +39,7 @@ data class AccountEntity(@field:PrimaryKey(autoGenerate = true) var id: Long,
                          var notificationsEnabled: Boolean = true,
                          var notificationsMentioned: Boolean = true,
                          var notificationsFollowed: Boolean = true,
+                         var notificationsFollowRequested: Boolean = false,
                          var notificationsReblogged: Boolean = true,
                          var notificationsFavorited: Boolean = true,
                          var notificationsPolls: Boolean = true,
@@ -54,7 +55,7 @@ data class AccountEntity(@field:PrimaryKey(autoGenerate = true) var id: Long,
                          var activeNotifications: String = "[]",
                          var emojis: List<Emoji> = emptyList(),
                          var tabPreferences: List<TabData> = defaultTabs(),
-                         var notificationsFilter: String = "[]") {
+                         var notificationsFilter: String = "[\"follow_request\"]") {
 
     val identifier: String
         get() = "$domain:$accountId"
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java b/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java
index e4d743c98..dc32eea7c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java
+++ b/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java
@@ -30,7 +30,7 @@ import androidx.annotation.NonNull;
 
 @Database(entities = {TootEntity.class, AccountEntity.class, InstanceEntity.class, TimelineStatusEntity.class,
                 TimelineAccountEntity.class,  ConversationEntity.class
-        }, version = 21)
+        }, version = 22)
 public abstract class AppDatabase extends RoomDatabase {
 
     public abstract TootDao tootDao();
@@ -326,4 +326,11 @@ public abstract class AppDatabase extends RoomDatabase {
         }
     };
 
-}
\ No newline at end of file
+    public static final Migration MIGRATION_21_22 = new Migration(21, 22) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE `AccountEntity` ADD COLUMN `notificationsFollowRequested` INTEGER NOT NULL DEFAULT 0");
+        }
+    };
+
+}
diff --git a/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
index 69194c795..669bd216a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
@@ -79,7 +79,7 @@ class AppModule {
                         AppDatabase.MIGRATION_11_12, AppDatabase.MIGRATION_12_13, AppDatabase.MIGRATION_10_13,
                         AppDatabase.MIGRATION_13_14, AppDatabase.MIGRATION_14_15, AppDatabase.MIGRATION_15_16,
                         AppDatabase.MIGRATION_16_17, AppDatabase.MIGRATION_17_18, AppDatabase.MIGRATION_18_19,
-                        AppDatabase.MIGRATION_19_20, AppDatabase.MIGRATION_20_21)
+                        AppDatabase.MIGRATION_19_20, AppDatabase.MIGRATION_20_21, AppDatabase.MIGRATION_21_22)
                 .build()
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt
index d9459ea80..fe342e7ae 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Notification.kt
@@ -31,6 +31,7 @@ data class Notification(
         REBLOG("reblog"),
         FAVOURITE("favourite"),
         FOLLOW("follow"),
+        FOLLOW_REQUEST("follow_request"),
         POLL("poll");
 
         companion object {
@@ -43,7 +44,7 @@ data class Notification(
                 }
                 return UNKNOWN
             }
-            val asList = listOf(MENTION, REBLOG, FAVOURITE, FOLLOW, POLL)
+            val asList = listOf(MENTION, REBLOG, FAVOURITE, FOLLOW, FOLLOW_REQUEST, POLL)
         }
 
         override fun toString(): String {
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
index e8a4b5f6c..41720f273 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
@@ -65,7 +65,9 @@ import com.keylesspalace.tusky.db.AccountManager;
 import com.keylesspalace.tusky.di.Injectable;
 import com.keylesspalace.tusky.entity.Notification;
 import com.keylesspalace.tusky.entity.Poll;
+import com.keylesspalace.tusky.entity.Relationship;
 import com.keylesspalace.tusky.entity.Status;
+import com.keylesspalace.tusky.interfaces.AccountActionListener;
 import com.keylesspalace.tusky.interfaces.ActionButtonActivity;
 import com.keylesspalace.tusky.interfaces.ReselectableFragment;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
@@ -98,6 +100,7 @@ import javax.inject.Inject;
 
 import at.connyduck.sparkbutton.helpers.Utils;
 import io.reactivex.Observable;
+import io.reactivex.Single;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import kotlin.Unit;
 import kotlin.collections.CollectionsKt;
@@ -115,6 +118,7 @@ public class NotificationsFragment extends SFragment implements
         SwipeRefreshLayout.OnRefreshListener,
         StatusActionListener,
         NotificationsAdapter.NotificationActionListener,
+        AccountActionListener,
         Injectable, ReselectableFragment {
     private static final String TAG = "NotificationF"; // logging tag
 
@@ -251,7 +255,7 @@ public class NotificationsFragment extends SFragment implements
         );
 
         adapter = new NotificationsAdapter(accountManager.getActiveAccount().getAccountId(),
-                dataSource, statusDisplayOptions, this, this);
+                dataSource, statusDisplayOptions, this, this, this);
         alwaysShowSensitiveMedia = accountManager.getActiveAccount().getAlwaysShowSensitiveMedia();
         alwaysOpenSpoiler = accountManager.getActiveAccount().getAlwaysOpenSpoiler();
         recyclerView.setAdapter(adapter);
@@ -765,6 +769,8 @@ public class NotificationsFragment extends SFragment implements
                 return getString(R.string.notification_boost_name);
             case FOLLOW:
                 return getString(R.string.notification_follow_name);
+            case FOLLOW_REQUEST:
+                return getString(R.string.notification_follow_request_name);
             case POLL:
                 return getString(R.string.notification_poll_name);
             default:
@@ -817,6 +823,29 @@ public class NotificationsFragment extends SFragment implements
         super.viewAccount(id);
     }
 
+    @Override
+    public void onMute(boolean mute, String id, int position) {
+        // No muting from notifications yet
+    }
+
+    @Override
+    public void onBlock(boolean block, String id, int position) {
+        // No blocking from notifications yet
+    }
+
+    @Override
+    public void onRespondToFollowRequest(boolean accept, String id, int position) {
+        Single<Relationship> request = accept ?
+                mastodonApi.authorizeFollowRequestObservable(id) :
+                mastodonApi.rejectFollowRequestObservable(id);
+        request.observeOn(AndroidSchedulers.mainThread())
+                .as(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))
+                .subscribe(
+                        (relationship) -> fullyRefreshWithProgressBar(true),
+                        (error) -> Log.e(TAG, String.format("Failed to %s account id %s", accept ? "accept" : "reject", id))
+                );
+    }
+
     @Override
     public void onViewStatusForNotificationId(String notificationId) {
         for (Either<Placeholder, Notification> either : notifications) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/NotificationPreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/NotificationPreferencesFragment.kt
index 9103775ea..093c23082 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/NotificationPreferencesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/NotificationPreferencesFragment.kt
@@ -41,42 +41,23 @@ class NotificationPreferencesFragment : PreferenceFragmentCompat(), Preference.O
         val activeAccount = accountManager.activeAccount
 
         if (activeAccount != null) {
-
-            val notificationPref = requirePreference("notificationsEnabled") as SwitchPreferenceCompat
-            notificationPref.isChecked = activeAccount.notificationsEnabled
-            notificationPref.onPreferenceChangeListener = this
-
-            val mentionedPref = requirePreference("notificationFilterMentions") as SwitchPreferenceCompat
-            mentionedPref.isChecked = activeAccount.notificationsMentioned
-            mentionedPref.onPreferenceChangeListener = this
-
-            val followedPref = requirePreference("notificationFilterFollows") as SwitchPreferenceCompat
-            followedPref.isChecked = activeAccount.notificationsFollowed
-            followedPref.onPreferenceChangeListener = this
-
-            val boostedPref = requirePreference("notificationFilterReblogs") as SwitchPreferenceCompat
-            boostedPref.isChecked = activeAccount.notificationsReblogged
-            boostedPref.onPreferenceChangeListener = this
-
-            val favoritedPref = requirePreference("notificationFilterFavourites") as SwitchPreferenceCompat
-            favoritedPref.isChecked = activeAccount.notificationsFavorited
-            favoritedPref.onPreferenceChangeListener = this
-
-            val pollsPref = requirePreference("notificationFilterPolls") as SwitchPreferenceCompat
-            pollsPref.isChecked = activeAccount.notificationsPolls
-            pollsPref.onPreferenceChangeListener = this
-
-            val soundPref = requirePreference("notificationAlertSound") as SwitchPreferenceCompat
-            soundPref.isChecked = activeAccount.notificationSound
-            soundPref.onPreferenceChangeListener = this
-
-            val vibrationPref = requirePreference("notificationAlertVibrate") as SwitchPreferenceCompat
-            vibrationPref.isChecked = activeAccount.notificationVibration
-            vibrationPref.onPreferenceChangeListener = this
-
-            val lightPref = requirePreference("notificationAlertLight") as SwitchPreferenceCompat
-            lightPref.isChecked = activeAccount.notificationLight
-            lightPref.onPreferenceChangeListener = this
+            for (pair in mapOf(
+                    "notificationsEnabled" to activeAccount.notificationsEnabled,
+                    "notificationFilterMentions" to activeAccount.notificationsMentioned,
+                    "notificationFilterFollows" to activeAccount.notificationsFollowed,
+                    "notificationFilterFollowRequests" to activeAccount.notificationsFollowRequested,
+                    "notificationFilterReblogs" to activeAccount.notificationsReblogged,
+                    "notificationFilterFavourites" to activeAccount.notificationsFavorited,
+                    "notificationFilterPolls" to activeAccount.notificationsPolls,
+                    "notificationAlertSound" to activeAccount.notificationSound,
+                    "notificationAlertVibrate" to activeAccount.notificationVibration,
+                    "notificationAlertLight" to activeAccount.notificationLight
+            )) {
+                (requirePreference(pair.key) as SwitchPreferenceCompat).apply {
+                    isChecked = pair.value
+                    onPreferenceChangeListener = this@NotificationPreferencesFragment
+                }
+            }
         }
     }
 
@@ -96,6 +77,7 @@ class NotificationPreferencesFragment : PreferenceFragmentCompat(), Preference.O
                 }
                 "notificationFilterMentions" -> activeAccount.notificationsMentioned = newValue as Boolean
                 "notificationFilterFollows" -> activeAccount.notificationsFollowed = newValue as Boolean
+                "notificationFilterFollowRequests" -> activeAccount.notificationsFollowRequested = newValue as Boolean
                 "notificationFilterReblogs" -> activeAccount.notificationsReblogged = newValue as Boolean
                 "notificationFilterFavourites" -> activeAccount.notificationsFavorited = newValue as Boolean
                 "notificationFilterPolls" -> activeAccount.notificationsPolls = newValue as Boolean
diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
index ccd8371b7..7c4b454a3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
@@ -383,6 +383,16 @@ interface MastodonApi {
             @Path("id") accountId: String
     ): Call<Relationship>
 
+    @POST("api/v1/follow_requests/{id}/authorize")
+    fun authorizeFollowRequestObservable(
+            @Path("id") accountId: String
+    ): Single<Relationship>
+
+    @POST("api/v1/follow_requests/{id}/reject")
+    fun rejectFollowRequestObservable(
+            @Path("id") accountId: String
+    ): Single<Relationship>
+
     @FormUrlEncoded
     @POST("api/v1/apps")
     fun authenticateApp(
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java b/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
index 4e0d298d7..8b526dc57 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
+++ b/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
@@ -113,6 +113,7 @@ public class NotificationHelper {
      **/
     public static final String CHANNEL_MENTION = "CHANNEL_MENTION";
     public static final String CHANNEL_FOLLOW = "CHANNEL_FOLLOW";
+    public static final String CHANNEL_FOLLOW_REQUEST = "CHANNEL_FOLLOW_REQUEST";
     public static final String CHANNEL_BOOST = "CHANNEL_BOOST";
     public static final String CHANNEL_FAVOURITE = "CHANNEL_FAVOURITE";
     public static final String CHANNEL_POLL = "CHANNEL_POLL";
@@ -348,6 +349,7 @@ public class NotificationHelper {
             String[] channelIds = new String[]{
                     CHANNEL_MENTION + account.getIdentifier(),
                     CHANNEL_FOLLOW + account.getIdentifier(),
+                    CHANNEL_FOLLOW_REQUEST + account.getIdentifier(),
                     CHANNEL_BOOST + account.getIdentifier(),
                     CHANNEL_FAVOURITE + account.getIdentifier(),
                     CHANNEL_POLL + account.getIdentifier(),
@@ -355,6 +357,7 @@ public class NotificationHelper {
             int[] channelNames = {
                     R.string.notification_mention_name,
                     R.string.notification_follow_name,
+                    R.string.notification_follow_request_name,
                     R.string.notification_boost_name,
                     R.string.notification_favourite_name,
                     R.string.notification_poll_name
@@ -362,12 +365,13 @@ public class NotificationHelper {
             int[] channelDescriptions = {
                     R.string.notification_mention_descriptions,
                     R.string.notification_follow_description,
+                    R.string.notification_follow_request_description,
                     R.string.notification_boost_description,
                     R.string.notification_favourite_description,
                     R.string.notification_poll_description
             };
 
-            List<NotificationChannel> channels = new ArrayList<>(5);
+            List<NotificationChannel> channels = new ArrayList<>(6);
 
             NotificationChannelGroup channelGroup = new NotificationChannelGroup(account.getIdentifier(), account.getFullName());
 
@@ -508,6 +512,8 @@ public class NotificationHelper {
                 return account.getNotificationsMentioned();
             case FOLLOW:
                 return account.getNotificationsFollowed();
+            case FOLLOW_REQUEST:
+                return account.getNotificationsFollowRequested();
             case REBLOG:
                 return account.getNotificationsReblogged();
             case FAVOURITE:
@@ -525,6 +531,8 @@ public class NotificationHelper {
                 return CHANNEL_MENTION + account.getIdentifier();
             case FOLLOW:
                 return CHANNEL_FOLLOW + account.getIdentifier();
+            case FOLLOW_REQUEST:
+                return CHANNEL_FOLLOW_REQUEST + account.getIdentifier();
             case REBLOG:
                 return CHANNEL_BOOST + account.getIdentifier();
             case FAVOURITE:
@@ -594,6 +602,9 @@ public class NotificationHelper {
             case FOLLOW:
                 return String.format(context.getString(R.string.notification_follow_format),
                         accountName);
+            case FOLLOW_REQUEST:
+                return String.format(context.getString(R.string.notification_follow_request_format),
+                        accountName);
             case FAVOURITE:
                 return String.format(context.getString(R.string.notification_favourite_format),
                         accountName);
@@ -613,6 +624,7 @@ public class NotificationHelper {
     private static String bodyForType(Notification notification, Context context) {
         switch (notification.getType()) {
             case FOLLOW:
+            case FOLLOW_REQUEST:
                 return "@" + notification.getAccount().getUsername();
             case MENTION:
             case FAVOURITE:
diff --git a/app/src/main/res/layout/item_follow_request_notification.xml b/app/src/main/res/layout/item_follow_request_notification.xml
new file mode 100644
index 000000000..712c08d42
--- /dev/null
+++ b/app/src/main/res/layout/item_follow_request_notification.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="10dp">
+
+    <androidx.emoji.widget.EmojiTextView
+        android:id="@+id/notificationTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:drawableStart="@drawable/ic_person_add_24dp"
+        android:drawablePadding="10dp"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:paddingStart="28dp"
+        android:textColor="?android:textColorTertiary"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Someone requested to follow you" />
+
+    <ImageView
+        android:id="@+id/avatar"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_centerVertical="true"
+        android:layout_marginTop="10dp"
+        android:contentDescription="@string/action_view_profile"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/notificationTextView" />
+
+    <androidx.emoji.widget.EmojiTextView
+        android:id="@+id/displayNameTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="14dp"
+        android:layout_marginTop="6dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="?attr/status_text_large"
+        android:textStyle="normal|bold"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toBottomOf="@id/notificationTextView"
+        tools:text="Display name" />
+
+    <TextView
+        android:id="@+id/usernameTextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="14dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="?attr/status_text_medium"
+        app:layout_constraintStart_toEndOf="@id/avatar"
+        app:layout_constraintTop_toBottomOf="@id/displayNameTextView"
+        tools:text="\@username" />
+
+    <ImageButton
+        android:id="@+id/acceptButton"
+        style="@style/TuskyImageButton"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="14dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_accept"
+        android:padding="4dp"
+        app:layout_constraintEnd_toStartOf="@id/rejectButton"
+        app:layout_constraintTop_toBottomOf="@id/notificationTextView"
+        app:srcCompat="@drawable/ic_check_24dp" />
+
+    <ImageButton
+        android:id="@+id/rejectButton"
+        style="@style/TuskyImageButton"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="14dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/action_reject"
+        android:padding="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/notificationTextView"
+        app:srcCompat="@drawable/ic_reject_24dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c21bdc9df..7a91facb7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,6 +60,7 @@
     <string name="notification_reblog_format">%s boosted your toot</string>
     <string name="notification_favourite_format">%s favorited your toot</string>
     <string name="notification_follow_format">%s followed you</string>
+    <string name="notification_follow_request_format">%s requested to follow you</string>
 
     <string name="report_username_format">Report @%s</string>
     <string name="report_comment_hint">Additional comments?</string>
@@ -208,6 +209,7 @@
     <string name="pref_title_notification_filters">Notify me when</string>
     <string name="pref_title_notification_filter_mentions">mentioned</string>
     <string name="pref_title_notification_filter_follows">followed</string>
+    <string name="pref_title_notification_filter_follow_requests">follow requested</string>
     <string name="pref_title_notification_filter_reblogs">my posts are boosted</string>
     <string name="pref_title_notification_filter_favourites">my posts are favorited</string>
     <string name="pref_title_notification_filter_poll">polls have ended</string>
@@ -262,6 +264,8 @@
     <string name="notification_mention_descriptions">Notifications about new mentions</string>
     <string name="notification_follow_name">New Followers</string>
     <string name="notification_follow_description">Notifications about new followers</string>
+    <string name="notification_follow_request_name">Follow Requests</string>
+    <string name="notification_follow_request_description">Notifications about follow requests</string>
     <string name="notification_boost_name">Boosts</string>
     <string name="notification_boost_description">Notifications when your toots get boosted</string>
     <string name="notification_favourite_name">Favorites</string>
diff --git a/app/src/main/res/xml/notification_preferences.xml b/app/src/main/res/xml/notification_preferences.xml
index 8bd044147..fa03f8d1b 100644
--- a/app/src/main/res/xml/notification_preferences.xml
+++ b/app/src/main/res/xml/notification_preferences.xml
@@ -27,6 +27,12 @@
             android:title="@string/pref_title_notification_filter_follows"
             app:iconSpaceReserved="false" />
 
+        <SwitchPreferenceCompat
+            android:defaultValue="false"
+            android:key="notificationFilterFollowRequests"
+            android:title="@string/pref_title_notification_filter_follow_requests"
+            app:iconSpaceReserved="false" />
+
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="notificationFilterReblogs"
diff --git a/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt
index ac2e955a5..9fa693215 100644
--- a/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/ComposeActivityTest.kt
@@ -68,6 +68,7 @@ class ComposeActivityTest {
             notificationsEnabled = true,
             notificationsMentioned = true,
             notificationsFollowed = true,
+            notificationsFollowRequested = false,
             notificationsReblogged = true,
             notificationsFavorited = true,
             notificationSound = true,

From f709301ff9d58bd9cb38346fe3bd14c88bb82ec5 Mon Sep 17 00:00:00 2001
From: Anonymous <noreply@weblate.org>
Date: Sun, 8 Mar 2020 09:42:03 +0000
Subject: [PATCH 28/42] Translated using Weblate (Swedish)

Currently translated at 75.0% (6 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/sv/
---
 fastlane/metadata/android/sv/changelogs/70.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/sv/changelogs/70.txt

diff --git a/fastlane/metadata/android/sv/changelogs/70.txt b/fastlane/metadata/android/sv/changelogs/70.txt
new file mode 100644
index 000000000..eb2428746
--- /dev/null
+++ b/fastlane/metadata/android/sv/changelogs/70.txt
@@ -0,0 +1,8 @@
+Tusky v10.0
+
+- You can now bookmark statuses & list your bookmarks in Tusky.
+- You can now schedule toots with Tusky. Note that the time you select has to be at least 5 minutes in the future.
+- You can now add lists to the main screen.
+- You can now post audio attachments with Tusky.
+
+And a lot of other small improvements and bug fixes!

From 73c47301105cbab1a0ef9c9f65ef06d92b09fa2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Quent=C3=AD?= <quentinantonin@free.fr>
Date: Sun, 22 Mar 2020 23:42:31 +0000
Subject: [PATCH 29/42] Translated using Weblate (Occitan)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/oc/
---
 app/src/main/res/values-oc/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 31e2a0406..ea8266f6c 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -491,4 +491,5 @@
     <string name="no_saved_status">Avètz pas cap de borrolhon.</string>
     <string name="no_scheduled_status">Avètz pas cap de tut planificat.</string>
 
-</resources>
+<string name="warning_scheduling_interval">L’interval minimum de planificacion sus Mastodon e de 5 minutas.</string>
+    </resources>

From 7973bf7d180636d4008162dc87327e8614880ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesc=20Gal=C3=AD?= <francescgali@protonmail.com>
Date: Sun, 22 Mar 2020 23:42:31 +0000
Subject: [PATCH 30/42] Translated using Weblate (Catalan)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/ca/
---
 app/src/main/res/values-ca/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index ce4efb9c8..e62c1b076 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -534,4 +534,7 @@
 
     <string name="no_scheduled_status">No tens cap estat planificat.</string>
 
-</resources>
+<string name="error_audio_upload_size">Els fitxers d\'àudio han de ser més petits de 40MB.</string>
+    <string name="no_saved_status">No tens cap esborrany.</string>
+    <string name="warning_scheduling_interval">L\'interval mínim de planificació a Mastodon és de 5 minuts.</string>
+    </resources>

From a25360645887e4ef1dc06735d481b76a798c985a Mon Sep 17 00:00:00 2001
From: Juanjo Salvador <juanjosalvador@netc.eu>
Date: Sun, 22 Mar 2020 23:42:31 +0000
Subject: [PATCH 31/42] Translated using Weblate (Spanish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/es/
---
 app/src/main/res/values-es/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0ae66004d..f0629173d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -474,9 +474,10 @@
     <string name="select_list_title">Seleccionar lista</string>
     <string name="list">Lista</string>
     <string name="error_audio_upload_size">Los ficheros de audio deben ser menores de 40MB.</string>
-    <string name="gradient_for_media">Mostrar degradados coloridos para el contenido multimedia oculto.</string>
+    <string name="gradient_for_media">Mostrar degradados coloridos para el contenido multimedia oculto</string>
 
     <string name="no_saved_status">No tienes ningún borrador.</string>
     <string name="no_scheduled_status">No tienes ningún estado programado.</string>
 
-</resources>
+<string name="warning_scheduling_interval">Mastodon tiene un intervalo de programación mínimo de 5 minutos.</string>
+    </resources>

From 8cb83050acdaa98582e0a617309a73d377061eca Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Tue, 24 Mar 2020 21:06:04 +0100
Subject: [PATCH 32/42] Add support for muting conversations (#1732)

* Add support for muting conversations
Implements #1731

* Fix CI

* Apply code review feedback
---
 .../23.json                                   | 741 ++++++++++++++++++
 .../keylesspalace/tusky/appstore/Events.kt    |   1 +
 .../conversation/ConversationEntity.kt        |   1 +
 .../components/search/SearchViewModel.kt      |  12 +
 .../fragments/SearchStatusesFragment.kt       |  37 +-
 .../keylesspalace/tusky/db/AppDatabase.java   |   9 +-
 .../tusky/db/TimelineStatusEntity.kt          |   3 +-
 .../com/keylesspalace/tusky/di/AppModule.kt   |   5 +-
 .../com/keylesspalace/tusky/entity/Status.kt  |   1 +
 .../tusky/fragment/SFragment.java             |  43 +-
 .../tusky/fragment/TimelineFragment.java      |   8 +
 .../tusky/network/MastodonApi.kt              |  10 +
 .../tusky/network/TimelineCases.kt            |  15 +-
 .../tusky/repository/TimelineRepository.kt    |   9 +-
 .../tusky/viewdata/StatusViewData.java        |  17 +-
 app/src/main/res/menu/status_more.xml         |   3 +
 .../main/res/menu/status_more_for_user.xml    |   3 +
 app/src/main/res/values/strings.xml           |   2 +
 .../tusky/BottomSheetActivityTest.kt          |   1 +
 .../com/keylesspalace/tusky/FilterTest.kt     |   1 +
 .../tusky/fragment/TimelineRepositoryTest.kt  |   1 +
 21 files changed, 904 insertions(+), 19 deletions(-)
 create mode 100644 app/schemas/com.keylesspalace.tusky.db.AppDatabase/23.json

diff --git a/app/schemas/com.keylesspalace.tusky.db.AppDatabase/23.json b/app/schemas/com.keylesspalace.tusky.db.AppDatabase/23.json
new file mode 100644
index 000000000..d7f2b2971
--- /dev/null
+++ b/app/schemas/com.keylesspalace.tusky.db.AppDatabase/23.json
@@ -0,0 +1,741 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "03a7436643ef356198742c5f8e054f5f",
+    "entities": [
+      {
+        "tableName": "TootEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `text` TEXT, `urls` TEXT, `descriptions` TEXT, `contentWarning` TEXT, `inReplyToId` TEXT, `inReplyToText` TEXT, `inReplyToUsername` TEXT, `visibility` INTEGER, `poll` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "uid",
+            "columnName": "uid",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "text",
+            "columnName": "text",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "urls",
+            "columnName": "urls",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "descriptions",
+            "columnName": "descriptions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "contentWarning",
+            "columnName": "contentWarning",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToId",
+            "columnName": "inReplyToId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToText",
+            "columnName": "inReplyToText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToUsername",
+            "columnName": "inReplyToUsername",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "visibility",
+            "columnName": "visibility",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "poll",
+            "columnName": "poll",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "uid"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "AccountEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `domain` TEXT NOT NULL, `accessToken` TEXT NOT NULL, `isActive` INTEGER NOT NULL, `accountId` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `profilePictureUrl` TEXT NOT NULL, `notificationsEnabled` INTEGER NOT NULL, `notificationsMentioned` INTEGER NOT NULL, `notificationsFollowed` INTEGER NOT NULL, `notificationsFollowRequested` INTEGER NOT NULL, `notificationsReblogged` INTEGER NOT NULL, `notificationsFavorited` INTEGER NOT NULL, `notificationsPolls` INTEGER NOT NULL, `notificationSound` INTEGER NOT NULL, `notificationVibration` INTEGER NOT NULL, `notificationLight` INTEGER NOT NULL, `defaultPostPrivacy` INTEGER NOT NULL, `defaultMediaSensitivity` INTEGER NOT NULL, `alwaysShowSensitiveMedia` INTEGER NOT NULL, `alwaysOpenSpoiler` INTEGER NOT NULL, `mediaPreviewEnabled` INTEGER NOT NULL, `lastNotificationId` TEXT NOT NULL, `activeNotifications` TEXT NOT NULL, `emojis` TEXT NOT NULL, `tabPreferences` TEXT NOT NULL, `notificationsFilter` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "domain",
+            "columnName": "domain",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accessToken",
+            "columnName": "accessToken",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isActive",
+            "columnName": "isActive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accountId",
+            "columnName": "accountId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profilePictureUrl",
+            "columnName": "profilePictureUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsEnabled",
+            "columnName": "notificationsEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsMentioned",
+            "columnName": "notificationsMentioned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFollowed",
+            "columnName": "notificationsFollowed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFollowRequested",
+            "columnName": "notificationsFollowRequested",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsReblogged",
+            "columnName": "notificationsReblogged",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFavorited",
+            "columnName": "notificationsFavorited",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsPolls",
+            "columnName": "notificationsPolls",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationSound",
+            "columnName": "notificationSound",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationVibration",
+            "columnName": "notificationVibration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationLight",
+            "columnName": "notificationLight",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaultPostPrivacy",
+            "columnName": "defaultPostPrivacy",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaultMediaSensitivity",
+            "columnName": "defaultMediaSensitivity",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alwaysShowSensitiveMedia",
+            "columnName": "alwaysShowSensitiveMedia",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alwaysOpenSpoiler",
+            "columnName": "alwaysOpenSpoiler",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mediaPreviewEnabled",
+            "columnName": "mediaPreviewEnabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastNotificationId",
+            "columnName": "lastNotificationId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "activeNotifications",
+            "columnName": "activeNotifications",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojis",
+            "columnName": "emojis",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tabPreferences",
+            "columnName": "tabPreferences",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "notificationsFilter",
+            "columnName": "notificationsFilter",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": true
+        },
+        "indices": [
+          {
+            "name": "index_AccountEntity_domain_accountId",
+            "unique": true,
+            "columnNames": [
+              "domain",
+              "accountId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_AccountEntity_domain_accountId` ON `${TABLE_NAME}` (`domain`, `accountId`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "InstanceEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`instance` TEXT NOT NULL, `emojiList` TEXT, `maximumTootCharacters` INTEGER, `maxPollOptions` INTEGER, `maxPollOptionLength` INTEGER, `version` TEXT, PRIMARY KEY(`instance`))",
+        "fields": [
+          {
+            "fieldPath": "instance",
+            "columnName": "instance",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojiList",
+            "columnName": "emojiList",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maximumTootCharacters",
+            "columnName": "maximumTootCharacters",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maxPollOptions",
+            "columnName": "maxPollOptions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "maxPollOptionLength",
+            "columnName": "maxPollOptionLength",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "instance"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TimelineStatusEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`serverId` TEXT NOT NULL, `url` TEXT, `timelineUserId` INTEGER NOT NULL, `authorServerId` TEXT, `inReplyToId` TEXT, `inReplyToAccountId` TEXT, `content` TEXT, `createdAt` INTEGER NOT NULL, `emojis` TEXT, `reblogsCount` INTEGER NOT NULL, `favouritesCount` INTEGER NOT NULL, `reblogged` INTEGER NOT NULL, `bookmarked` INTEGER NOT NULL, `favourited` INTEGER NOT NULL, `sensitive` INTEGER NOT NULL, `spoilerText` TEXT, `visibility` INTEGER, `attachments` TEXT, `mentions` TEXT, `application` TEXT, `reblogServerId` TEXT, `reblogAccountId` TEXT, `poll` TEXT, `muted` INTEGER, PRIMARY KEY(`serverId`, `timelineUserId`), FOREIGN KEY(`authorServerId`, `timelineUserId`) REFERENCES `TimelineAccountEntity`(`serverId`, `timelineUserId`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "serverId",
+            "columnName": "serverId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timelineUserId",
+            "columnName": "timelineUserId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "authorServerId",
+            "columnName": "authorServerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToId",
+            "columnName": "inReplyToId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "inReplyToAccountId",
+            "columnName": "inReplyToAccountId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "content",
+            "columnName": "content",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "createdAt",
+            "columnName": "createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojis",
+            "columnName": "emojis",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "reblogsCount",
+            "columnName": "reblogsCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "favouritesCount",
+            "columnName": "favouritesCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "reblogged",
+            "columnName": "reblogged",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bookmarked",
+            "columnName": "bookmarked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "favourited",
+            "columnName": "favourited",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "sensitive",
+            "columnName": "sensitive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "spoilerText",
+            "columnName": "spoilerText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "visibility",
+            "columnName": "visibility",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "attachments",
+            "columnName": "attachments",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "mentions",
+            "columnName": "mentions",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "application",
+            "columnName": "application",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "reblogServerId",
+            "columnName": "reblogServerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "reblogAccountId",
+            "columnName": "reblogAccountId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "poll",
+            "columnName": "poll",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "muted",
+            "columnName": "muted",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "serverId",
+            "timelineUserId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_TimelineStatusEntity_authorServerId_timelineUserId",
+            "unique": false,
+            "columnNames": [
+              "authorServerId",
+              "timelineUserId"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_TimelineStatusEntity_authorServerId_timelineUserId` ON `${TABLE_NAME}` (`authorServerId`, `timelineUserId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "TimelineAccountEntity",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "authorServerId",
+              "timelineUserId"
+            ],
+            "referencedColumns": [
+              "serverId",
+              "timelineUserId"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "TimelineAccountEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`serverId` TEXT NOT NULL, `timelineUserId` INTEGER NOT NULL, `localUsername` TEXT NOT NULL, `username` TEXT NOT NULL, `displayName` TEXT NOT NULL, `url` TEXT NOT NULL, `avatar` TEXT NOT NULL, `emojis` TEXT NOT NULL, `bot` INTEGER NOT NULL, PRIMARY KEY(`serverId`, `timelineUserId`))",
+        "fields": [
+          {
+            "fieldPath": "serverId",
+            "columnName": "serverId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timelineUserId",
+            "columnName": "timelineUserId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localUsername",
+            "columnName": "localUsername",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "displayName",
+            "columnName": "displayName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "avatar",
+            "columnName": "avatar",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "emojis",
+            "columnName": "emojis",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bot",
+            "columnName": "bot",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "serverId",
+            "timelineUserId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "ConversationEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountId` INTEGER NOT NULL, `id` TEXT NOT NULL, `accounts` TEXT NOT NULL, `unread` INTEGER NOT NULL, `s_id` TEXT NOT NULL, `s_url` TEXT, `s_inReplyToId` TEXT, `s_inReplyToAccountId` TEXT, `s_account` TEXT NOT NULL, `s_content` TEXT NOT NULL, `s_createdAt` INTEGER NOT NULL, `s_emojis` TEXT NOT NULL, `s_favouritesCount` INTEGER NOT NULL, `s_favourited` INTEGER NOT NULL, `s_bookmarked` INTEGER NOT NULL, `s_sensitive` INTEGER NOT NULL, `s_spoilerText` TEXT NOT NULL, `s_attachments` TEXT NOT NULL, `s_mentions` TEXT NOT NULL, `s_showingHiddenContent` INTEGER NOT NULL, `s_expanded` INTEGER NOT NULL, `s_collapsible` INTEGER NOT NULL, `s_collapsed` INTEGER NOT NULL, `s_poll` TEXT, PRIMARY KEY(`id`, `accountId`))",
+        "fields": [
+          {
+            "fieldPath": "accountId",
+            "columnName": "accountId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "accounts",
+            "columnName": "accounts",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.id",
+            "columnName": "s_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.url",
+            "columnName": "s_url",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastStatus.inReplyToId",
+            "columnName": "s_inReplyToId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastStatus.inReplyToAccountId",
+            "columnName": "s_inReplyToAccountId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastStatus.account",
+            "columnName": "s_account",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.content",
+            "columnName": "s_content",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.createdAt",
+            "columnName": "s_createdAt",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.emojis",
+            "columnName": "s_emojis",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.favouritesCount",
+            "columnName": "s_favouritesCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.favourited",
+            "columnName": "s_favourited",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.bookmarked",
+            "columnName": "s_bookmarked",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.sensitive",
+            "columnName": "s_sensitive",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.spoilerText",
+            "columnName": "s_spoilerText",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.attachments",
+            "columnName": "s_attachments",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.mentions",
+            "columnName": "s_mentions",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.showingHiddenContent",
+            "columnName": "s_showingHiddenContent",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.expanded",
+            "columnName": "s_expanded",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.collapsible",
+            "columnName": "s_collapsible",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.collapsed",
+            "columnName": "s_collapsed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastStatus.poll",
+            "columnName": "s_poll",
+            "affinity": "TEXT",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id",
+            "accountId"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '03a7436643ef356198742c5f8e054f5f')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt b/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
index 7bdc17e62..8e62faeb3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/appstore/Events.kt
@@ -8,6 +8,7 @@ import com.keylesspalace.tusky.entity.Status
 data class FavoriteEvent(val statusId: String, val favourite: Boolean) : Dispatchable
 data class ReblogEvent(val statusId: String, val reblog: Boolean) : Dispatchable
 data class BookmarkEvent(val statusId: String, val bookmark: Boolean) : Dispatchable
+data class MuteConversationEvent(val statusId: String, val mute: Boolean) : Dispatchable
 data class UnfollowEvent(val accountId: String) : Dispatchable
 data class BlockEvent(val accountId: String) : Dispatchable
 data class MuteEvent(val accountId: String) : Dispatchable
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
index 7c4ed108b..8ee1a284a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationEntity.kt
@@ -157,6 +157,7 @@ data class ConversationStatusEntity(
                 mentions = mentions,
                 application = null,
                 pinned = false,
+                muted = false,
                 poll = poll,
                 card = null)
     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
index 7979fee55..71121a91d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
@@ -213,6 +213,18 @@ class SearchViewModel @Inject constructor(
         search(currentQuery)
     }
 
+    fun muteConversation(status: Pair<Status, StatusViewData.Concrete>, mute: Boolean) {
+        val idx = loadedStatuses.indexOf(status)
+        if (idx >= 0) {
+            val newPair = Pair(status.first, StatusViewData.Builder(status.second).setMuted(mute).createStatusViewData())
+            loadedStatuses[idx] = newPair
+            repoResultStatus.value?.refresh?.invoke()
+        }
+        timelineCases.muteConversation(status.first, mute)
+                .onErrorReturnItem(status.first)
+                .subscribe()
+                .autoDispose()
+    }
 
     companion object {
         private const val TAG = "SearchViewModel"
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
index ac171b9e7..0833f04cd 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
@@ -49,6 +49,7 @@ import com.keylesspalace.tusky.components.search.adapter.SearchStatusesAdapter
 import com.keylesspalace.tusky.db.AccountEntity
 import com.keylesspalace.tusky.entity.Attachment
 import com.keylesspalace.tusky.entity.Status
+import com.keylesspalace.tusky.entity.Status.Mention
 import com.keylesspalace.tusky.interfaces.AccountSelectionListener
 import com.keylesspalace.tusky.interfaces.StatusActionListener
 import com.keylesspalace.tusky.util.CardViewMode
@@ -228,12 +229,9 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
         val loggedInAccountId = viewModel.activeAccount?.accountId
 
         val popup = PopupMenu(view.context, view)
+        val statusIsByCurrentUser = loggedInAccountId?.equals(accountId) == true
         // Give a different menu depending on whether this is the user's own toot or not.
-        if (loggedInAccountId == null || loggedInAccountId != accountId) {
-            popup.inflate(R.menu.status_more)
-            val menu = popup.menu
-            menu.findItem(R.id.status_download_media).isVisible = status.attachments.isNotEmpty()
-        } else {
+        if (statusIsByCurrentUser) {
             popup.inflate(R.menu.status_more_for_user)
             val menu = popup.menu
             menu.findItem(R.id.status_open_as).isVisible = !statusUrl.isNullOrBlank()
@@ -251,6 +249,10 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
                 Status.Visibility.UNKNOWN, Status.Visibility.DIRECT -> {
                 } //Ignore
             }
+        } else {
+            popup.inflate(R.menu.status_more)
+            val menu = popup.menu
+            menu.findItem(R.id.status_download_media).isVisible = status.attachments.isNotEmpty()
         }
 
         val openAsItem = popup.menu.findItem(R.id.status_open_as)
@@ -266,6 +268,19 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
         }
         openAsItem.title = openAsTitle
 
+        val mutable = statusIsByCurrentUser || accountIsInMentions(viewModel.activeAccount, status.mentions)
+        val muteConversationItem = popup.menu.findItem(R.id.status_mute_conversation).apply {
+            isVisible = mutable
+        }
+        if (mutable) {
+            muteConversationItem.setTitle(
+                    if (status.muted == true) {
+                        R.string.action_unmute_conversation
+                    } else {
+                        R.string.action_mute_conversation
+                    })
+        }
+
         popup.setOnMenuItemClickListener { item ->
             when (item.itemId) {
                 R.id.status_share_content -> {
@@ -303,6 +318,12 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
                     requestDownloadAllMedia(status)
                     return@setOnMenuItemClickListener true
                 }
+                R.id.status_mute_conversation -> {
+                    searchAdapter.getItem(position)?.let { foundStatus ->
+                        viewModel.muteConversation(foundStatus, status.muted != true)
+                    }
+                    return@setOnMenuItemClickListener true
+                }
                 R.id.status_mute -> {
                     viewModel.muteAcount(accountId)
                     return@setOnMenuItemClickListener true
@@ -341,6 +362,12 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
         popup.show()
     }
 
+    private fun accountIsInMentions(account: AccountEntity?, mentions: Array<Mention>): Boolean {
+        return mentions.firstOrNull {
+            account?.username == it.username && account.domain == Uri.parse(it.url)?.host
+        } != null
+    }
+
     private fun showOpenAsDialog(statusUrl: String, dialogTitle: CharSequence) {
         bottomSheetActivity?.showAccountChooserDialog(dialogTitle, false, object : AccountSelectionListener {
             override fun onAccountSelected(account: AccountEntity) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java b/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java
index dc32eea7c..608333d93 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java
+++ b/app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java
@@ -30,7 +30,7 @@ import androidx.annotation.NonNull;
 
 @Database(entities = {TootEntity.class, AccountEntity.class, InstanceEntity.class, TimelineStatusEntity.class,
                 TimelineAccountEntity.class,  ConversationEntity.class
-        }, version = 22)
+        }, version = 23)
 public abstract class AppDatabase extends RoomDatabase {
 
     public abstract TootDao tootDao();
@@ -333,4 +333,11 @@ public abstract class AppDatabase extends RoomDatabase {
         }
     };
 
+    public static final Migration MIGRATION_22_23 = new Migration(22, 23) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE `TimelineStatusEntity` ADD COLUMN `muted` INTEGER");
+        }
+    };
+
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt b/app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt
index 94111a954..da98cb4b3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt
@@ -51,7 +51,8 @@ data class TimelineStatusEntity(
         val application: String?,
         val reblogServerId: String?, // if it has a reblogged status, it's id is stored here
         val reblogAccountId: String?,
-        val poll: String?
+        val poll: String?,
+        val muted: Boolean?
 )
 
 @Entity(
diff --git a/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
index 669bd216a..a4f2eb5eb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
@@ -79,8 +79,9 @@ class AppModule {
                         AppDatabase.MIGRATION_11_12, AppDatabase.MIGRATION_12_13, AppDatabase.MIGRATION_10_13,
                         AppDatabase.MIGRATION_13_14, AppDatabase.MIGRATION_14_15, AppDatabase.MIGRATION_15_16,
                         AppDatabase.MIGRATION_16_17, AppDatabase.MIGRATION_17_18, AppDatabase.MIGRATION_18_19,
-                        AppDatabase.MIGRATION_19_20, AppDatabase.MIGRATION_20_21, AppDatabase.MIGRATION_21_22)
-                .build()
+                        AppDatabase.MIGRATION_19_20, AppDatabase.MIGRATION_20_21, AppDatabase.MIGRATION_21_22,
+                        AppDatabase.MIGRATION_22_23)
+        .build()
     }
 
     @Provides
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
index 2ccf0dcb2..aee30e8d7 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Status.kt
@@ -43,6 +43,7 @@ data class Status(
         val mentions: Array<Mention>,
         val application: Application?,
         var pinned: Boolean?,
+        var muted: Boolean?,
         val poll: Poll?,
         val card: Card?
 ) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
index 4f795f183..6a7e5f12d 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
@@ -185,11 +185,8 @@ public abstract class SFragment extends BaseFragment implements Injectable {
 
         PopupMenu popup = new PopupMenu(getContext(), view);
         // Give a different menu depending on whether this is the user's own toot or not.
-        if (loggedInAccountId == null || !loggedInAccountId.equals(accountId)) {
-            popup.inflate(R.menu.status_more);
-            Menu menu = popup.getMenu();
-            menu.findItem(R.id.status_download_media).setVisible(!status.getAttachments().isEmpty());
-        } else {
+        boolean statusIsByCurrentUser = loggedInAccountId != null && loggedInAccountId.equals(accountId);
+        if (statusIsByCurrentUser) {
             popup.inflate(R.menu.status_more_for_user);
             Menu menu = popup.getMenu();
             switch (status.getVisibility()) {
@@ -208,6 +205,10 @@ public abstract class SFragment extends BaseFragment implements Injectable {
                     break;
                 }
             }
+        } else {
+            popup.inflate(R.menu.status_more);
+            Menu menu = popup.getMenu();
+            menu.findItem(R.id.status_download_media).setVisible(!status.getAttachments().isEmpty());
         }
 
         Menu menu = popup.getMenu();
@@ -231,6 +232,15 @@ public abstract class SFragment extends BaseFragment implements Injectable {
         }
         openAsItem.setTitle(openAsTitle);
 
+        MenuItem muteConversationItem = menu.findItem(R.id.status_mute_conversation);
+        boolean mutable = statusIsByCurrentUser || accountIsInMentions(activeAccount, status.getMentions());
+        muteConversationItem.setVisible(mutable);
+        if (mutable) {
+            muteConversationItem.setTitle((status.getMuted() == null || !status.getMuted()) ?
+                    R.string.action_mute_conversation :
+                    R.string.action_unmute_conversation);
+        }
+
         popup.setOnMenuItemClickListener(item -> {
             switch (item.getItemId()) {
                 case R.id.status_share_content: {
@@ -305,12 +315,35 @@ public abstract class SFragment extends BaseFragment implements Injectable {
                     timelineCases.pin(status, !status.isPinned());
                     return true;
                 }
+                case R.id.status_mute_conversation: {
+                    timelineCases.muteConversation(status, status.getMuted() == null || !status.getMuted())
+                            .observeOn(AndroidSchedulers.mainThread())
+                            .as(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))
+                            .subscribe();
+                    return true;
+                }
             }
             return false;
         });
         popup.show();
     }
 
+    private static boolean accountIsInMentions(AccountEntity account, Status.Mention[] mentions) {
+        if (account == null) {
+            return false;
+        }
+
+        for (Status.Mention mention : mentions) {
+            if (account.getUsername().equals(mention.getUsername())) {
+                Uri uri = Uri.parse(mention.getUrl());
+                if (uri != null && account.getDomain().equals(uri.getHost())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     protected void viewMedia(int urlIndex, Status status, @Nullable View view) {
         final Status actionable = status.getActionableStatus();
         final Attachment active = actionable.getAttachments().get(urlIndex);
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 8db927b29..0c20cfafe 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -53,6 +53,7 @@ import com.keylesspalace.tusky.appstore.BookmarkEvent;
 import com.keylesspalace.tusky.appstore.DomainMuteEvent;
 import com.keylesspalace.tusky.appstore.EventHub;
 import com.keylesspalace.tusky.appstore.FavoriteEvent;
+import com.keylesspalace.tusky.appstore.MuteConversationEvent;
 import com.keylesspalace.tusky.appstore.MuteEvent;
 import com.keylesspalace.tusky.appstore.PreferenceChangedEvent;
 import com.keylesspalace.tusky.appstore.ReblogEvent;
@@ -503,6 +504,9 @@ public class TimelineFragment extends SFragment implements
                         } else if (event instanceof BookmarkEvent) {
                             BookmarkEvent bookmarkEvent = (BookmarkEvent) event;
                             handleBookmarkEvent(bookmarkEvent);
+                        } else if (event instanceof MuteConversationEvent) {
+                            MuteConversationEvent muteEvent = (MuteConversationEvent) event;
+                            handleMuteConversationEvent(muteEvent);
                         } else if (event instanceof UnfollowEvent) {
                             if (kind == Kind.HOME) {
                                 String id = ((UnfollowEvent) event).getAccountId();
@@ -1313,6 +1317,10 @@ public class TimelineFragment extends SFragment implements
         setBookmarkForStatus(pos, status, bookmarkEvent.getBookmark());
     }
 
+    private void handleMuteConversationEvent(@NonNull MuteConversationEvent event) {
+        fullyRefresh();
+    }
+
     private void handleStatusComposeEvent(@NonNull Status status) {
         switch (kind) {
             case HOME:
diff --git a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
index 7c4b454a3..dc69ed7d5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
@@ -200,6 +200,16 @@ interface MastodonApi {
             @Path("id") statusId: String
     ): Single<Status>
 
+    @POST("api/v1/statuses/{id}/mute")
+    fun muteConversation(
+            @Path("id") statusId: String
+    ): Single<Status>
+
+    @POST("api/v1/statuses/{id}/unmute")
+    fun unmuteConversation(
+            @Path("id") statusId: String
+    ): Single<Status>
+
     @GET("api/v1/scheduled_statuses")
     fun scheduledStatuses(
             @Query("limit") limit: Int? = null,
diff --git a/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt b/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt
index ce9dc7a9b..50b086982 100644
--- a/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/TimelineCases.kt
@@ -41,7 +41,7 @@ interface TimelineCases {
     fun delete(id: String): Single<DeletedStatus>
     fun pin(status: Status, pin: Boolean)
     fun voteInPoll(status: Status, choices: List<Int>): Single<Poll>
-
+    fun muteConversation(status: Status, mute: Boolean): Single<Status>
 }
 
 class TimelineCasesImpl(
@@ -94,6 +94,19 @@ class TimelineCasesImpl(
         }
     }
 
+    override fun muteConversation(status: Status, mute: Boolean): Single<Status> {
+        val id = status.actionableId
+
+        val call = if (mute) {
+            mastodonApi.muteConversation(id)
+        } else {
+            mastodonApi.unmuteConversation(id)
+        }
+        return call.doAfterSuccess {
+            eventHub.dispatch(MuteConversationEvent(status.id, mute))
+        }
+    }
+
     override fun mute(id: String) {
         val call = mastodonApi.muteAccount(id)
         call.enqueue(object : Callback<Relationship> {
diff --git a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
index 06c001c91..f16bb542c 100644
--- a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
@@ -229,6 +229,7 @@ class TimelineRepositoryImpl(
                     mentions = mentions,
                     application = application,
                     pinned = false,
+                    muted = status.muted,
                     poll = poll,
                     card = null
             )
@@ -256,6 +257,7 @@ class TimelineRepositoryImpl(
                     mentions = arrayOf(),
                     application = null,
                     pinned = false,
+                    muted = status.muted,
                     poll = null,
                     card = null
             )
@@ -282,6 +284,7 @@ class TimelineRepositoryImpl(
                     mentions = mentions,
                     application = application,
                     pinned = false,
+                    muted = status.muted,
                     poll = poll,
                     card = null
             )
@@ -353,7 +356,8 @@ fun Placeholder.toEntity(timelineUserId: Long): TimelineStatusEntity {
             application = null,
             reblogServerId = null,
             reblogAccountId = null,
-            poll = null
+            poll = null,
+            muted = false
     )
 }
 
@@ -384,7 +388,8 @@ fun Status.toEntity(timelineUserId: Long,
             application = actionable.let(gson::toJson),
             reblogServerId = reblog?.id,
             reblogAccountId = reblog?.let { this.account.id },
-            poll = actionable.poll.let(gson::toJson)
+            poll = actionable.poll.let(gson::toJson),
+            muted = actionable.muted
     )
 }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java b/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java
index b43c7628d..81e101007 100644
--- a/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java
+++ b/app/src/main/java/com/keylesspalace/tusky/viewdata/StatusViewData.java
@@ -57,6 +57,7 @@ public abstract class StatusViewData {
         final boolean reblogged;
         final boolean favourited;
         final boolean bookmarked;
+        private final boolean muted;
         @Nullable
         private final String spoilerText;
         private final Status.Visibility visibility;
@@ -92,7 +93,7 @@ public abstract class StatusViewData {
         private final PollViewData poll;
         private final boolean isBot;
 
-        public Concrete(String id, Spanned content, boolean reblogged, boolean favourited, boolean bookmarked,
+        public Concrete(String id, Spanned content, boolean reblogged, boolean favourited, boolean bookmarked, boolean muted,
                         @Nullable String spoilerText, Status.Visibility visibility, List<Attachment> attachments,
                         @Nullable String rebloggedByUsername, @Nullable String rebloggedAvatar, boolean sensitive, boolean isExpanded,
                         boolean isShowingContent, String userFullName, String nickname, String avatar,
@@ -115,6 +116,7 @@ public abstract class StatusViewData {
             this.reblogged = reblogged;
             this.favourited = favourited;
             this.bookmarked = bookmarked;
+            this.muted = muted;
             this.visibility = visibility;
             this.attachments = attachments;
             this.rebloggedByUsername = rebloggedByUsername;
@@ -161,6 +163,10 @@ public abstract class StatusViewData {
             return bookmarked;
         }
 
+        public boolean isMuted() {
+            return muted;
+        }
+
         @Nullable
         public String getSpoilerText() {
             return spoilerText;
@@ -401,6 +407,7 @@ public abstract class StatusViewData {
         private boolean reblogged;
         private boolean favourited;
         private boolean bookmarked;
+        private boolean muted;
         private String spoilerText;
         private Status.Visibility visibility;
         private List<Attachment> attachments;
@@ -437,6 +444,7 @@ public abstract class StatusViewData {
             reblogged = viewData.reblogged;
             favourited = viewData.favourited;
             bookmarked = viewData.bookmarked;
+            muted = viewData.muted;
             spoilerText = viewData.spoilerText;
             visibility = viewData.visibility;
             attachments = viewData.attachments == null ? null : new ArrayList<>(viewData.attachments);
@@ -490,6 +498,11 @@ public abstract class StatusViewData {
             return this;
         }
 
+        public Builder setMuted(boolean muted) {
+            this.muted = muted;
+            return this;
+        }
+
         public Builder setSpoilerText(String spoilerText) {
             this.spoilerText = spoilerText;
             return this;
@@ -639,7 +652,7 @@ public abstract class StatusViewData {
             if (this.accountEmojis == null) accountEmojis = Collections.emptyList();
             if (this.createdAt == null) createdAt = new Date();
 
-            return new StatusViewData.Concrete(id, content, reblogged, favourited, bookmarked, spoilerText,
+            return new StatusViewData.Concrete(id, content, reblogged, favourited, bookmarked, muted, spoilerText,
                     visibility, attachments, rebloggedByUsername, rebloggedAvatar, isSensitive, isExpanded,
                     isShowingContent, userFullName, nickname, avatar, createdAt, reblogsCount,
                     favouritesCount, inReplyToId, mentions, senderId, rebloggingEnabled, application,
diff --git a/app/src/main/res/menu/status_more.xml b/app/src/main/res/menu/status_more.xml
index 525ce90a3..c73b7e9f0 100644
--- a/app/src/main/res/menu/status_more.xml
+++ b/app/src/main/res/menu/status_more.xml
@@ -21,6 +21,9 @@
     <item
         android:id="@+id/status_download_media"
         android:title="@string/download_media" />
+    <item
+        android:id="@+id/status_mute_conversation"
+        android:title="@string/action_mute_conversation" />
     <item
         android:id="@+id/status_mute"
         android:title="@string/action_mute" />
diff --git a/app/src/main/res/menu/status_more_for_user.xml b/app/src/main/res/menu/status_more_for_user.xml
index 9b363e492..e4f391ab2 100644
--- a/app/src/main/res/menu/status_more_for_user.xml
+++ b/app/src/main/res/menu/status_more_for_user.xml
@@ -26,6 +26,9 @@
         android:id="@+id/status_unreblog_private"
         android:title="@string/unreblog_private"
         android:visible="false" />
+    <item
+        android:id="@+id/status_mute_conversation"
+        android:title="@string/action_mute_conversation" />
     <item
         android:id="@+id/status_delete"
         android:title="@string/action_delete" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7a91facb7..b517db86e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,6 +109,8 @@
     <string name="action_mute">Mute</string>
     <string name="action_unmute">Unmute</string>
     <string name="action_mute_domain">Mute %s</string>
+    <string name="action_mute_conversation">Mute conversation</string>
+    <string name="action_unmute_conversation">Unmute conversation</string>
     <string name="action_mention">Mention</string>
     <string name="action_hide_media">Hide media</string>
     <string name="action_open_drawer">Open drawer</string>
diff --git a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
index 5c92667ec..86d0925f3 100644
--- a/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/BottomSheetActivityTest.kt
@@ -88,6 +88,7 @@ class BottomSheetActivityTest {
             arrayOf(),
             null,
             pinned = false,
+            muted = false,
             poll = null,
             card = null
     )
diff --git a/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
index 965eda674..19288499f 100644
--- a/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
@@ -214,6 +214,7 @@ class FilterTest {
                 mentions = emptyArray(),
                 application = null,
                 pinned = false,
+                muted = false,
                 poll = if (pollOptions != null) {
                     Poll(
                             id = "1234",
diff --git a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
index b55be0908..f80f57b8c 100644
--- a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
@@ -314,6 +314,7 @@ class TimelineRepositoryTest {
                 inReplyToAccountId = null,
                 inReplyToId = null,
                 pinned = false,
+                muted = false,
                 reblog = null,
                 url = "http://example.com/statuses/$id",
                 poll = null,

From cf782f039f5b363141877228c911f3d7132a6492 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 24 Mar 2020 21:06:58 +0100
Subject: [PATCH 33/42] use number of voters instead of votes to calculate poll
 results (#1733)

* adjust poll vote text, votes -> people

* use number of voters instead of votes to calculate poll results

* fix tests
---
 .../tusky/adapter/PollAdapter.kt              | 12 ++++++---
 .../tusky/adapter/StatusBaseViewHolder.java   | 16 ++++++++----
 .../com/keylesspalace/tusky/entity/Poll.kt    |  8 +++++-
 .../tusky/util/NotificationHelper.java        |  2 +-
 .../tusky/util/StatusViewHelper.kt            | 22 +++++++++-------
 .../tusky/viewdata/PollViewData.kt            | 25 +++++++++++--------
 app/src/main/res/values/strings.xml           |  4 +++
 .../com/keylesspalace/tusky/FilterTest.kt     |  1 +
 8 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/PollAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/PollAdapter.kt
index 0adc0c371..ea75c16a9 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/PollAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/PollAdapter.kt
@@ -26,7 +26,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.entity.Emoji
 import com.keylesspalace.tusky.util.CustomEmojiHelper
-import com.keylesspalace.tusky.util.HtmlUtils
 import com.keylesspalace.tusky.util.visible
 import com.keylesspalace.tusky.viewdata.PollOptionViewData
 import com.keylesspalace.tusky.viewdata.buildDescription
@@ -36,12 +35,19 @@ class PollAdapter: RecyclerView.Adapter<PollViewHolder>() {
 
     private var pollOptions: List<PollOptionViewData> = emptyList()
     private var voteCount: Int = 0
+    private var votersCount: Int? = null
     private var mode = RESULT
     private var emojis: List<Emoji> = emptyList()
 
-    fun setup(options: List<PollOptionViewData>, voteCount: Int, emojis: List<Emoji>, mode: Int) {
+    fun setup(
+            options: List<PollOptionViewData>,
+            voteCount: Int,
+            votersCount: Int?,
+            emojis: List<Emoji>,
+            mode: Int) {
         this.pollOptions = options
         this.voteCount = voteCount
+        this.votersCount = votersCount
         this.emojis = emojis
         this.mode = mode
         notifyDataSetChanged()
@@ -71,7 +77,7 @@ class PollAdapter: RecyclerView.Adapter<PollViewHolder>() {
 
         when(mode) {
             RESULT -> {
-                val percent = calculatePercent(option.votesCount, voteCount)
+                val percent = calculatePercent(option.votesCount, votersCount, voteCount)
                 val emojifiedPollOptionText = CustomEmojiHelper.emojifyText(buildDescription(option.title, percent, holder.resultTextView.context), emojis, holder.resultTextView)
                 holder.resultTextView.text =  EmojiCompat.get().process(emojifiedPollOptionText)
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index ad0e6573d..71156967b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -869,7 +869,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             List<PollOptionViewData> options = poll.getOptions();
             for (int i = 0; i < args.length; i++) {
                 if (i < options.size()) {
-                    int percent = PollViewDataKt.calculatePercent(options.get(i).getVotesCount(), poll.getVotesCount());
+                    int percent = PollViewDataKt.calculatePercent(options.get(i).getVotesCount(), poll.getVotersCount(), poll.getVotesCount());
                     args[i] = buildDescription(options.get(i).getTitle(), percent, context);
                 } else {
                     args[i] = "";
@@ -912,12 +912,12 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
 
         if (expired || poll.getVoted()) {
             // no voting possible
-            pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), emojis, PollAdapter.RESULT);
+            pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), poll.getVotersCount(), emojis, PollAdapter.RESULT);
 
             pollButton.setVisibility(View.GONE);
         } else {
             // voting possible
-            pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), emojis, poll.getMultiple() ? PollAdapter.MULTIPLE : PollAdapter.SINGLE);
+            pollAdapter.setup(poll.getOptions(), poll.getVotesCount(), poll.getVotersCount(), emojis, poll.getMultiple() ? PollAdapter.MULTIPLE : PollAdapter.SINGLE);
 
             pollButton.setVisibility(View.VISIBLE);
 
@@ -944,8 +944,14 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     private CharSequence getPollInfoText(long timestamp, PollViewData poll,
                                          StatusDisplayOptions statusDisplayOptions,
                                          Context context) {
-        String votes = numberFormat.format(poll.getVotesCount());
-        String votesText = context.getResources().getQuantityString(R.plurals.poll_info_votes, poll.getVotesCount(), votes);
+        String votesText;
+        if(poll.getVotersCount() == null) {
+            String voters = numberFormat.format(poll.getVotesCount());
+            votesText = context.getResources().getQuantityString(R.plurals.poll_info_votes, poll.getVotesCount(), voters);
+        } else {
+            String voters = numberFormat.format(poll.getVotersCount());
+            votesText = context.getResources().getQuantityString(R.plurals.poll_info_people, poll.getVotersCount(), voters);
+        }
         CharSequence pollDurationInfo;
         if (poll.getExpired()) {
             pollDurationInfo = context.getString(R.string.poll_info_closed);
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Poll.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Poll.kt
index 57361d1b0..02c236c48 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Poll.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Poll.kt
@@ -9,6 +9,7 @@ data class Poll(
         val expired: Boolean,
         val multiple: Boolean,
         @SerializedName("votes_count") val votesCount: Int,
+        @SerializedName("voters_count") val votersCount: Int?, // nullable for compatibility with Pleroma
         val options: List<PollOption>,
         val voted: Boolean
 ) {
@@ -22,7 +23,12 @@ data class Poll(
             }
         }
 
-        return copy(options = newOptions, votesCount = votesCount + choices.size, voted = true)
+        return copy(
+                options = newOptions,
+                votesCount = votesCount + choices.size,
+                votersCount = votersCount?.plus(1),
+                voted = true
+        )
     }
 
     fun toNewPoll(creationDate: Date) = NewPoll(
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java b/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
index 8b526dc57..c98e8b5ca 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
+++ b/app/src/main/java/com/keylesspalace/tusky/util/NotificationHelper.java
@@ -643,7 +643,7 @@ public class NotificationHelper {
                     Poll poll = notification.getStatus().getPoll();
                     for(PollOption option: poll.getOptions()) {
                         builder.append(buildDescription(option.getTitle(),
-                                PollViewDataKt.calculatePercent(option.getVotesCount(), poll.getVotesCount()),
+                                PollViewDataKt.calculatePercent(option.getVotesCount(), poll.getVotersCount(), poll.getVotesCount()),
                                 context));
                         builder.append('\n');
                     }
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
index 840e220e4..98660bc39 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
@@ -24,7 +24,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.content.ContextCompat
 import com.bumptech.glide.Glide
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.entity.Attachment
@@ -275,17 +274,22 @@ class StatusViewHelper(private val itemView: View) {
 
     private fun getPollInfoText(timestamp: Long, poll: PollViewData, pollDescription: TextView, useAbsoluteTime: Boolean): CharSequence {
         val context = pollDescription.context
-        val votes = NumberFormat.getNumberInstance().format(poll.votesCount.toLong())
-        val votesText = context.resources.getQuantityString(R.plurals.poll_info_votes, poll.votesCount, votes)
-        val pollDurationInfo: CharSequence
-        if (poll.expired) {
-            pollDurationInfo = context.getString(R.string.poll_info_closed)
+
+        val votesText = if(poll.votersCount == null) {
+            val votes = NumberFormat.getNumberInstance().format(poll.votesCount.toLong())
+            context.resources.getQuantityString(R.plurals.poll_info_votes, poll.votesCount, votes)
+        } else {
+            val votes = NumberFormat.getNumberInstance().format(poll.votersCount.toLong())
+            context.resources.getQuantityString(R.plurals.poll_info_people, poll.votersCount, votes)
+        }
+        val pollDurationInfo = if (poll.expired) {
+            context.getString(R.string.poll_info_closed)
         } else {
             if (useAbsoluteTime) {
-                pollDurationInfo = context.getString(R.string.poll_info_time_absolute, getAbsoluteTime(poll.expiresAt))
+                context.getString(R.string.poll_info_time_absolute, getAbsoluteTime(poll.expiresAt))
             } else {
                 val pollDuration = TimestampUtils.formatPollDuration(context, poll.expiresAt!!.time, timestamp)
-                pollDurationInfo = context.getString(R.string.poll_info_time_relative, pollDuration)
+                context.getString(R.string.poll_info_time_relative, pollDuration)
             }
         }
 
@@ -298,7 +302,7 @@ class StatusViewHelper(private val itemView: View) {
 
         for (i in 0 until Status.MAX_POLL_OPTIONS) {
             if (i < options.size) {
-                val percent = calculatePercent(options[i].votesCount, poll.votesCount)
+                val percent = calculatePercent(options[i].votesCount, poll.votersCount, poll.votesCount)
 
                 val pollOptionText = buildDescription(options[i].title, percent, pollResults[i].context)
                 pollResults[i].text = CustomEmojiHelper.emojifyText(pollOptionText, emojis, pollResults[i])
diff --git a/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt b/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt
index dff0c9f60..729893215 100644
--- a/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt
@@ -31,6 +31,7 @@ data class PollViewData(
         val expired: Boolean,
         val multiple: Boolean,
         val votesCount: Int,
+        val votersCount: Int?,
         val options: List<PollOptionViewData>,
         var voted: Boolean
 )
@@ -41,10 +42,11 @@ data class PollOptionViewData(
         var selected: Boolean
 )
 
-fun calculatePercent(fraction: Int, total: Int): Int {
+fun calculatePercent(fraction: Int, totalVoters: Int?, totalVotes: Int): Int {
     return if (fraction == 0) {
         0
     } else {
+        val total = totalVoters ?: totalVotes
         (fraction / total.toDouble() * 100).roundToInt()
     }
 }
@@ -58,20 +60,21 @@ fun buildDescription(title: String, percent: Int, context: Context): Spanned {
 fun Poll?.toViewData(): PollViewData? {
     if (this == null) return null
     return PollViewData(
-            id,
-            expiresAt,
-            expired,
-            multiple,
-            votesCount,
-            options.map { it.toViewData() },
-            voted
+            id = id,
+            expiresAt = expiresAt,
+            expired = expired,
+            multiple = multiple,
+            votesCount = votesCount,
+            votersCount = votersCount,
+            options = options.map { it.toViewData() },
+            voted = voted
     )
 }
 
 fun PollOption.toViewData(): PollOptionViewData {
     return PollOptionViewData(
-            title,
-            votesCount,
-            false
+            title = title,
+            votesCount = votesCount,
+            selected = false
     )
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b517db86e..509005654 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -494,6 +494,10 @@
         <item quantity="one">%s vote</item>
         <item quantity="other">%s votes</item>
     </plurals>
+    <plurals name="poll_info_people">
+        <item quantity="one">%s person</item>
+        <item quantity="other">%s people</item>
+    </plurals>
     <string name="poll_info_time_relative">%s left</string>
     <string name="poll_info_time_absolute">ends at %s</string>
     <string name="poll_info_closed">closed</string>
diff --git a/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
index 19288499f..8b0c916aa 100644
--- a/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
@@ -222,6 +222,7 @@ class FilterTest {
                             expired = false,
                             multiple = false,
                             votesCount = 0,
+                            votersCount = 0,
                             options = pollOptions.map {
                                 PollOption(it, 0)
                             },

From adac296e04c9aaf48ef0607d644bfddc1c926df5 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 24 Mar 2020 21:07:10 +0100
Subject: [PATCH 34/42] simplify ComposeOptionsView (#1734)

---
 .../compose/view/ComposeOptionsView.kt        |  15 +--
 app/src/main/res/layout/activity_compose.xml  |   8 +-
 .../main/res/layout/view_compose_options.xml  | 108 +++++++++---------
 3 files changed, 59 insertions(+), 72 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeOptionsView.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeOptionsView.kt
index c99df40f2..8f80c76df 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeOptionsView.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ComposeOptionsView.kt
@@ -17,25 +17,18 @@ package com.keylesspalace.tusky.components.compose.view
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.LinearLayout
+import android.widget.RadioGroup
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.entity.Status
-import kotlinx.android.synthetic.main.view_compose_options.view.*
 
-
-class ComposeOptionsView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : LinearLayout(context, attrs, defStyleAttr) {
+class ComposeOptionsView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : RadioGroup(context, attrs) {
 
     var listener: ComposeOptionsListener? = null
 
     init {
         inflate(context, R.layout.view_compose_options, this)
 
-        publicRadioButton.setButtonDrawable(R.drawable.ic_public_24dp)
-        unlistedRadioButton.setButtonDrawable(R.drawable.ic_lock_open_24dp)
-        privateRadioButton.setButtonDrawable(R.drawable.ic_lock_outline_24dp)
-        directRadioButton.setButtonDrawable(R.drawable.ic_email_24dp)
-
-        visibilityRadioGroup.setOnCheckedChangeListener { _, checkedId ->
+        setOnCheckedChangeListener { _, checkedId ->
             val visibility = when (checkedId) {
                 R.id.publicRadioButton ->
                     Status.Visibility.PUBLIC
@@ -67,7 +60,7 @@ class ComposeOptionsView @JvmOverloads constructor(context: Context, attrs: Attr
 
         }
 
-        visibilityRadioGroup.check(selectedButton)
+        check(selectedButton)
     }
 
 }
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index c0f934289..d25b2b094 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -215,10 +215,10 @@
         android:layout_height="wrap_content"
         android:background="?attr/colorSurface"
         android:elevation="12dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="52dp"
+        android:paddingStart="24dp"
+        android:paddingTop="12dp"
+        android:paddingEnd="24dp"
+        android:paddingBottom="60dp"
         app:behavior_hideable="true"
         app:behavior_peekHeight="0dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior" />
diff --git a/app/src/main/res/layout/view_compose_options.xml b/app/src/main/res/layout/view_compose_options.xml
index 21f4659a9..ee8c70e87 100644
--- a/app/src/main/res/layout/view_compose_options.xml
+++ b/app/src/main/res/layout/view_compose_options.xml
@@ -1,68 +1,62 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:parentTag="android.widget.LinearLayout">
+    tools:layout_height="wrap_content"
+    tools:layout_width="match_parent"
+    tools:parentTag="RadioGroup">
 
-    <RadioGroup
-        android:id="@+id/visibilityRadioGroup"
+    <RadioButton
+        android:id="@+id/publicRadioButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_weight="1"
+        android:button="@drawable/ic_public_24dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="0dp"
+        android:text="@string/visibility_public"
+        android:textColor="?android:textColorTertiary"
+        app:buttonTint="@color/compound_button_color" />
+
+    <RadioButton
+        android:id="@+id/unlistedRadioButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/compose_options_margin"
-        android:layout_marginLeft="@dimen/compose_options_margin"
-        android:layout_marginRight="@dimen/compose_options_margin"
         android:layout_marginTop="4dp"
-        android:orientation="vertical">
+        android:layout_marginBottom="4dp"
+        android:layout_weight="1"
+        android:button="@drawable/ic_lock_open_24dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="0dp"
+        android:text="@string/visibility_unlisted"
+        android:textColor="?android:textColorTertiary"
+        app:buttonTint="@color/compound_button_color" />
 
-        <RadioButton
-            android:id="@+id/publicRadioButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_weight="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="10dp"
-            android:text="@string/visibility_public"
-            android:textColor="?android:textColorTertiary"
-            app:buttonTint="@color/compound_button_color" />
+    <RadioButton
+        android:id="@+id/privateRadioButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:layout_weight="1"
+        android:button="@drawable/ic_lock_outline_24dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="0dp"
+        android:text="@string/visibility_private"
+        android:textColor="?android:textColorTertiary"
+        app:buttonTint="@color/compound_button_color" />
 
-        <RadioButton
-            android:id="@+id/unlistedRadioButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:layout_weight="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="10dp"
-            android:text="@string/visibility_unlisted"
-            android:textColor="?android:textColorTertiary"
-            app:buttonTint="@color/compound_button_color" />
-
-        <RadioButton
-            android:id="@+id/privateRadioButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginTop="4dp"
-            android:layout_weight="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="10dp"
-            android:text="@string/visibility_private"
-            android:textColor="?android:textColorTertiary"
-            app:buttonTint="@color/compound_button_color" />
-
-        <RadioButton
-            android:id="@+id/directRadioButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_weight="1"
-            android:paddingEnd="0dp"
-            android:paddingStart="10dp"
-            android:text="@string/visibility_direct"
-            android:textColor="?android:textColorTertiary"
-            app:buttonTint="@color/compound_button_color" />
-
-    </RadioGroup>
+    <RadioButton
+        android:id="@+id/directRadioButton"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_weight="1"
+        android:button="@drawable/ic_email_24dp"
+        android:paddingStart="10dp"
+        android:paddingEnd="0dp"
+        android:text="@string/visibility_direct"
+        android:textColor="?android:textColorTertiary"
+        app:buttonTint="@color/compound_button_color" />
 
 </merge>
\ No newline at end of file

From 1b476c790a532968d891be3b0687fc39b3a977e9 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 27 Mar 2020 19:04:28 +0100
Subject: [PATCH 35/42] Fix NPE in follow requests view (#1739)

Fixes #1738
---
 .../keylesspalace/tusky/adapter/FollowRequestViewHolder.kt    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt
index d9fd0491e..fb303354e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestViewHolder.kt
@@ -23,9 +23,9 @@ internal class FollowRequestViewHolder(itemView: View, private val showHeader: B
         val emojifiedName: CharSequence = CustomEmojiHelper.emojifyString(wrappedName, account.emojis, itemView)
         itemView.displayNameTextView.text = emojifiedName
         if (showHeader) {
-            itemView.notificationTextView.text = itemView.context.getString(R.string.notification_follow_request_format, emojifiedName)
+            itemView.notificationTextView?.text = itemView.context.getString(R.string.notification_follow_request_format, emojifiedName)
         }
-        itemView.notificationTextView.visible(showHeader)
+        itemView.notificationTextView?.visible(showHeader)
         val format = itemView.context.getString(R.string.status_username_format)
         val formattedUsername = String.format(format, account.username)
         itemView.usernameTextView.text = formattedUsername

From 0b8efc934925d596f1caf79859f19c9d06d067f8 Mon Sep 17 00:00:00 2001
From: Juanjo Salvador <juanjosalvador@netc.eu>
Date: Mon, 30 Mar 2020 09:42:45 +0000
Subject: [PATCH 36/42] Translated using Weblate (Spanish)

Currently translated at 100.0% (410 of 410 strings)

Translation: Tusky/Tusky
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky/es/
---
 app/src/main/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f0629173d..0084df92f 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,7 +4,7 @@
     <string name="error_network">¡Se ha producido un error de red! ¡Por favor, comprueba tu conexión e inténtalo de nuevo!</string>
     <string name="error_empty">Este campo no puede estar vacío.</string>
     <string name="error_invalid_domain">Nombre de dominio incorrecto</string>
-    <string name="error_failed_app_registration">Inicio de sesión fallido.</string>
+    <string name="error_failed_app_registration">Fallo de autenticación con esta instancia.</string>
     <string name="error_no_web_browser_found">No se ha encontrado ningún navegador web.</string>
     <string name="error_authorization_unknown">Ocurrió un error de autorización no identificado.</string>
     <string name="error_authorization_denied">La autorización falló.</string>

From 91263eed8b4b479f3a2d356bdd14d27828e510c2 Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Mon, 30 Mar 2020 21:03:27 +0200
Subject: [PATCH 37/42] Confirm blocks and mutes from timelines (#1740)

* Add preference for confirming blocks and mutes from timelines
Implements #1737

* Apply code review feedback
---
 .../keylesspalace/tusky/AccountActivity.kt    | 28 +++++++++++++++++--
 .../components/search/SearchViewModel.kt      |  2 +-
 .../fragments/SearchStatusesFragment.kt       | 20 +++++++++++--
 .../tusky/fragment/SFragment.java             | 21 ++++++++++++--
 app/src/main/res/values/strings.xml           |  2 ++
 5 files changed, 66 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index ad91b19ec..333eb09d1 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -681,6 +681,30 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 .show()
     }
 
+    private fun toggleBlock() {
+        if (viewModel.relationshipData.value?.data?.blocking != true) {
+            AlertDialog.Builder(this)
+                    .setMessage(getString(R.string.dialog_block_warning, loadedAccount?.username))
+                    .setPositiveButton(android.R.string.ok) { _, _ -> viewModel.changeBlockState() }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show()
+        } else {
+            viewModel.changeBlockState()
+        }
+    }
+
+    private fun toggleMute() {
+        if (viewModel.relationshipData.value?.data?.muting != true) {
+            AlertDialog.Builder(this)
+                    .setMessage(getString(R.string.dialog_mute_warning, loadedAccount?.username))
+                    .setPositiveButton(android.R.string.ok) { _, _ -> viewModel.changeMuteState() }
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .show()
+        } else {
+            viewModel.changeMuteState()
+        }
+    }
+
     private fun mention() {
         loadedAccount?.let {
             val intent = ComposeActivity.startIntent(this,
@@ -727,11 +751,11 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 return true
             }
             R.id.action_block -> {
-                viewModel.changeBlockState()
+                toggleBlock()
                 return true
             }
             R.id.action_mute -> {
-                viewModel.changeMuteState()
+                toggleMute()
                 return true
             }
             R.id.action_mute_domain -> {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
index 71121a91d..aa55c99cd 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
@@ -193,7 +193,7 @@ class SearchViewModel @Inject constructor(
         return accountManager.getAllAccountsOrderedByActive()
     }
 
-    fun muteAcount(accountId: String) {
+    fun muteAccount(accountId: String) {
         timelineCases.mute(accountId)
     }
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
index 0833f04cd..4e5f64fbe 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
@@ -325,11 +325,11 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
                     return@setOnMenuItemClickListener true
                 }
                 R.id.status_mute -> {
-                    viewModel.muteAcount(accountId)
+                    onMute(accountId, accountUsername)
                     return@setOnMenuItemClickListener true
                 }
                 R.id.status_block -> {
-                    viewModel.blockAccount(accountId)
+                    onBlock(accountId, accountUsername)
                     return@setOnMenuItemClickListener true
                 }
                 R.id.status_report -> {
@@ -362,6 +362,22 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
         popup.show()
     }
 
+    private fun onBlock(accountId: String, accountUsername: String) {
+        AlertDialog.Builder(requireContext())
+                .setMessage(getString(R.string.dialog_block_warning, accountUsername))
+                .setPositiveButton(android.R.string.ok) { _, _ -> viewModel.blockAccount(accountId) }
+                .setNegativeButton(android.R.string.cancel, null)
+                .show()
+    }
+
+    private fun onMute(accountId: String, accountUsername: String) {
+        AlertDialog.Builder(requireContext())
+                .setMessage(getString(R.string.dialog_mute_warning, accountUsername))
+                .setPositiveButton(android.R.string.ok) { _, _ -> viewModel.muteAccount(accountId) }
+                .setNegativeButton(android.R.string.cancel, null)
+                .show()
+    }
+
     private fun accountIsInMentions(account: AccountEntity?, mentions: Array<Mention>): Boolean {
         return mentions.firstOrNull {
             account?.username == it.username && account.domain == Uri.parse(it.url)?.host
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
index 6a7e5f12d..5b475a046 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
@@ -39,6 +39,7 @@ import androidx.appcompat.widget.PopupMenu;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.view.ViewCompat;
 import androidx.lifecycle.Lifecycle;
+import androidx.preference.PreferenceManager;
 
 import com.keylesspalace.tusky.BaseActivity;
 import com.keylesspalace.tusky.BottomSheetActivity;
@@ -284,11 +285,11 @@ public abstract class SFragment extends BaseFragment implements Injectable {
                     return true;
                 }
                 case R.id.status_mute: {
-                    timelineCases.mute(accountId);
+                    onMute(accountId, accountUsername);
                     return true;
                 }
                 case R.id.status_block: {
-                    timelineCases.block(accountId);
+                    onBlock(accountId, accountUsername);
                     return true;
                 }
                 case R.id.status_report: {
@@ -328,6 +329,22 @@ public abstract class SFragment extends BaseFragment implements Injectable {
         popup.show();
     }
 
+    private void onMute(String accountId, String accountUsername) {
+        new AlertDialog.Builder(requireContext())
+                .setMessage(getString(R.string.dialog_mute_warning, accountUsername))
+                .setPositiveButton(android.R.string.ok, (__, ___) -> timelineCases.mute(accountId))
+                .setNegativeButton(android.R.string.cancel, null)
+                .show();
+    }
+
+    private void onBlock(String accountId, String accountUsername) {
+        new AlertDialog.Builder(requireContext())
+                .setMessage(getString(R.string.dialog_block_warning, accountUsername))
+                .setPositiveButton(android.R.string.ok, (__, ___) -> timelineCases.block(accountId))
+                .setNegativeButton(android.R.string.cancel, null)
+                .show();
+    }
+
     private static boolean accountIsInMentions(AccountEntity account, Status.Mention[] mentions) {
         if (account == null) {
             return false;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 509005654..bf480226f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,6 +196,8 @@
     <string name="dialog_redraft_toot_warning">Delete and re-draft this toot?</string>
     <string name="mute_domain_warning">Are you sure you want to block all of %s? You will not see content from that domain in any public timelines or in your notifications. Your followers from that domain will be removed.</string>
     <string name="mute_domain_warning_dialog_ok">Hide entire domain</string>
+    <string name="dialog_block_warning">Block @%s?</string>
+    <string name="dialog_mute_warning">Mute @%s?</string>
 
     <string name="visibility_public">Public: Post to public timelines</string>
     <string name="visibility_unlisted">Unlisted: Do not show in public timelines</string>

From 914eff95fc618e62db065c20a8d1ff0dcec9fef3 Mon Sep 17 00:00:00 2001
From: Jordi Brunet <jbrus77@cryptolab.net>
Date: Sat, 21 Mar 2020 20:53:32 +0000
Subject: [PATCH 38/42] Translated using Weblate (Catalan)

Currently translated at 100.0% (8 of 8 strings)

Translation: Tusky/Tusky-app
Translate-URL: https://weblate.tusky.app/projects/tusky/tusky-app/ca/
---
 fastlane/metadata/android/ca/short_description.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/ca/short_description.txt b/fastlane/metadata/android/ca/short_description.txt
index c24acd732..151f74e27 100644
--- a/fastlane/metadata/android/ca/short_description.txt
+++ b/fastlane/metadata/android/ca/short_description.txt
@@ -1 +1 @@
-Un client per a diversos comptes per a la xarxa social Mastodont
+Un client multicomptes per a la xarxa social Mastodont

From 68f34152dce790e7000b37ae50aa7bc93d96e48f Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Thu, 2 Apr 2020 23:37:38 +0200
Subject: [PATCH 39/42] replace HtmlUtils with HtmlCompat (#1741)

* replace HtmlUtils with HtmlCompat

* fix tests
---
 .../tusky/adapter/StatusBaseViewHolder.java   |  6 +--
 .../com/keylesspalace/tusky/db/Converters.kt  |  7 +--
 .../com/keylesspalace/tusky/di/AppModule.kt   |  7 ---
 .../tusky/di/RepositoryModule.kt              | 13 ++---
 .../com/keylesspalace/tusky/entity/Account.kt | 33 +++---------
 .../com/keylesspalace/tusky/entity/Card.kt    | 10 ++--
 .../tusky/json/SpannedTypeAdapter.java        | 17 ++++--
 .../tusky/repository/TimelineRepository.kt    | 17 +++---
 .../keylesspalace/tusky/util/HtmlConverter.kt | 22 --------
 .../keylesspalace/tusky/util/HtmlUtils.java   | 52 -------------------
 .../tusky/util/StatusViewHelper.kt            |  5 +-
 .../tusky/viewdata/PollViewData.kt            |  4 +-
 .../tusky/fragment/TimelineRepositoryTest.kt  | 37 ++++++-------
 13 files changed, 65 insertions(+), 165 deletions(-)
 delete mode 100644 app/src/main/java/com/keylesspalace/tusky/util/HtmlConverter.kt
 delete mode 100644 app/src/main/java/com/keylesspalace/tusky/util/HtmlUtils.java

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 71156967b..f808cb1bb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -20,6 +20,7 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.text.HtmlCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -38,7 +39,6 @@ import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.util.CardViewMode;
 import com.keylesspalace.tusky.util.CustomEmojiHelper;
-import com.keylesspalace.tusky.util.HtmlUtils;
 import com.keylesspalace.tusky.util.ImageLoadingHelper;
 import com.keylesspalace.tusky.util.LinkHelper;
 import com.keylesspalace.tusky.util.StatusDisplayOptions;
@@ -884,7 +884,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     protected CharSequence getFavsText(Context context, int count) {
         if (count > 0) {
             String countString = numberFormat.format(count);
-            return HtmlUtils.fromHtml(context.getResources().getQuantityString(R.plurals.favs, count, countString));
+            return HtmlCompat.fromHtml(context.getResources().getQuantityString(R.plurals.favs, count, countString), HtmlCompat.FROM_HTML_MODE_LEGACY);
         } else {
             return "";
         }
@@ -893,7 +893,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
     protected CharSequence getReblogsText(Context context, int count) {
         if (count > 0) {
             String countString = numberFormat.format(count);
-            return HtmlUtils.fromHtml(context.getResources().getQuantityString(R.plurals.reblogs, count, countString));
+            return HtmlCompat.fromHtml(context.getResources().getQuantityString(R.plurals.reblogs, count, countString), HtmlCompat.FROM_HTML_MODE_LEGACY);
         } else {
             return "";
         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt b/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
index 0074b8d9b..09f8a5cbd 100644
--- a/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/db/Converters.kt
@@ -16,6 +16,8 @@
 package com.keylesspalace.tusky.db
 
 import android.text.Spanned
+import androidx.core.text.parseAsHtml
+import androidx.core.text.toHtml
 import androidx.room.TypeConverter
 import com.google.gson.GsonBuilder
 import com.google.gson.reflect.TypeToken
@@ -27,7 +29,6 @@ import com.keylesspalace.tusky.entity.Emoji
 import com.keylesspalace.tusky.entity.Poll
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.json.SpannedTypeAdapter
-import com.keylesspalace.tusky.util.HtmlUtils
 import java.net.URLDecoder
 import java.net.URLEncoder
 import java.util.*
@@ -128,7 +129,7 @@ class Converters {
         if(spanned == null) {
             return null
         }
-        return HtmlUtils.toHtml(spanned)
+        return spanned.toHtml()
     }
 
     @TypeConverter
@@ -136,7 +137,7 @@ class Converters {
         if(spannedString == null) {
             return null
         }
-        return HtmlUtils.fromHtml(spannedString)
+        return spannedString.parseAsHtml()
     }
 
     @TypeConverter
diff --git a/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
index a4f2eb5eb..e87ef2894 100644
--- a/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/di/AppModule.kt
@@ -29,8 +29,6 @@ import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.network.TimelineCases
 import com.keylesspalace.tusky.network.TimelineCasesImpl
-import com.keylesspalace.tusky.util.HtmlConverter
-import com.keylesspalace.tusky.util.HtmlConverterImpl
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
@@ -84,9 +82,4 @@ class AppModule {
         .build()
     }
 
-    @Provides
-    @Singleton
-    fun providesHtmlConverter(): HtmlConverter {
-        return HtmlConverterImpl()
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/di/RepositoryModule.kt b/app/src/main/java/com/keylesspalace/tusky/di/RepositoryModule.kt
index 1b5206a74..af8cfb886 100644
--- a/app/src/main/java/com/keylesspalace/tusky/di/RepositoryModule.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/di/RepositoryModule.kt
@@ -6,17 +6,18 @@ import com.keylesspalace.tusky.db.AppDatabase
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.repository.TimelineRepository
 import com.keylesspalace.tusky.repository.TimelineRepositoryImpl
-import com.keylesspalace.tusky.util.HtmlConverter
 import dagger.Module
 import dagger.Provides
 
 @Module
 class RepositoryModule {
     @Provides
-    fun providesTimelineRepository(db: AppDatabase, mastodonApi: MastodonApi,
-                                   accountManager: AccountManager, gson: Gson,
-                                   htmlConverter: HtmlConverter): TimelineRepository {
-        return TimelineRepositoryImpl(db.timelineDao(), mastodonApi, accountManager, gson,
-                htmlConverter)
+    fun providesTimelineRepository(
+            db: AppDatabase,
+            mastodonApi: MastodonApi,
+            accountManager: AccountManager,
+            gson: Gson
+    ): TimelineRepository {
+        return TimelineRepositoryImpl(db.timelineDao(), mastodonApi, accountManager, gson)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
index 62990758e..d4940fe0e 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Account.kt
@@ -15,24 +15,16 @@
 
 package com.keylesspalace.tusky.entity
 
-import android.os.Parcel
-import android.os.Parcelable
 import android.text.Spanned
-
 import com.google.gson.annotations.SerializedName
-import com.keylesspalace.tusky.util.HtmlUtils
-import kotlinx.android.parcel.Parceler
-import kotlinx.android.parcel.Parcelize
-import kotlinx.android.parcel.WriteWith
-import java.util.*
+import java.util.Date
 
-@Parcelize
 data class Account(
         val id: String,
         @SerializedName("username") val localUsername: String,
         @SerializedName("acct") val username: String,
         @SerializedName("display_name") val displayName: String?, // should never be null per Api definition, but some servers break the contract
-        val note: @WriteWith<SpannedParceler>() Spanned,
+        val note: Spanned,
         val url: String,
         val avatar: String,
         val header: String,
@@ -46,7 +38,7 @@ data class Account(
         val fields: List<Field>? = emptyList(),  //nullable for backward compatibility
         val moved: Account? = null
 
-) : Parcelable {
+) {
 
     val name: String
         get() = if (displayName.isNullOrEmpty()) {
@@ -86,31 +78,20 @@ data class Account(
     fun isRemote(): Boolean = this.username != this.localUsername
 }
 
-@Parcelize
 data class AccountSource(
         val privacy: Status.Visibility,
         val sensitive: Boolean,
         val note: String,
         val fields: List<StringField>?
-): Parcelable
+)
 
-@Parcelize
 data class Field (
         val name: String,
-        val value: @WriteWith<SpannedParceler>() Spanned,
+        val value: Spanned,
         @SerializedName("verified_at") val verifiedAt: Date?
-): Parcelable
+)
 
-@Parcelize
 data class StringField (
         val name: String,
         val value: String
-): Parcelable
-
-object SpannedParceler : Parceler<Spanned> {
-    override fun create(parcel: Parcel): Spanned = HtmlUtils.fromHtml(parcel.readString())
-
-    override fun Spanned.write(parcel: Parcel, flags: Int) {
-        parcel.writeString(HtmlUtils.toHtml(this))
-    }
-}
\ No newline at end of file
+)
diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Card.kt b/app/src/main/java/com/keylesspalace/tusky/entity/Card.kt
index c6f82637f..43e54f010 100644
--- a/app/src/main/java/com/keylesspalace/tusky/entity/Card.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/entity/Card.kt
@@ -15,23 +15,19 @@
 
 package com.keylesspalace.tusky.entity
 
-import android.os.Parcelable
 import android.text.Spanned
 import com.google.gson.annotations.SerializedName
-import kotlinx.android.parcel.Parcelize
-import kotlinx.android.parcel.WriteWith
 
-@Parcelize
 data class Card(
         val url: String,
-        val title: @WriteWith<SpannedParceler>() Spanned,
-        val description: @WriteWith<SpannedParceler>() Spanned,
+        val title: Spanned,
+        val description: Spanned,
         @SerializedName("author_name") val authorName: String,
         val image: String,
         val type: String,
         val width: Int,
         val height: Int
-) : Parcelable {
+) {
 
     override fun hashCode(): Int {
         return url.hashCode()
diff --git a/app/src/main/java/com/keylesspalace/tusky/json/SpannedTypeAdapter.java b/app/src/main/java/com/keylesspalace/tusky/json/SpannedTypeAdapter.java
index cabd3eb86..a884695f8 100644
--- a/app/src/main/java/com/keylesspalace/tusky/json/SpannedTypeAdapter.java
+++ b/app/src/main/java/com/keylesspalace/tusky/json/SpannedTypeAdapter.java
@@ -18,6 +18,8 @@ package com.keylesspalace.tusky.json;
 import android.text.Spanned;
 import android.text.SpannedString;
 
+import androidx.core.text.HtmlCompat;
+
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -25,7 +27,6 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import com.keylesspalace.tusky.util.HtmlUtils;
 
 import java.lang.reflect.Type;
 
@@ -35,7 +36,9 @@ public class SpannedTypeAdapter implements JsonDeserializer<Spanned>, JsonSerial
             throws JsonParseException {
         String string = json.getAsString();
         if (string != null) {
-            return HtmlUtils.fromHtml(string);
+            /* Html.fromHtml returns trailing whitespace if the html ends in a </p> tag, which
+             * all status contents do, so it should be trimmed. */
+            return (Spanned)trimTrailingWhitespace(HtmlCompat.fromHtml(string, HtmlCompat.FROM_HTML_MODE_LEGACY));
         } else {
             return new SpannedString("");
         }
@@ -43,6 +46,14 @@ public class SpannedTypeAdapter implements JsonDeserializer<Spanned>, JsonSerial
 
     @Override
     public JsonElement serialize(Spanned src, Type typeOfSrc, JsonSerializationContext context) {
-        return new JsonPrimitive(HtmlUtils.toHtml(src));
+        return new JsonPrimitive(HtmlCompat.toHtml(src, HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL));
+    }
+
+    private static CharSequence trimTrailingWhitespace(CharSequence s) {
+        int i = s.length();
+        do {
+            i--;
+        } while (i >= 0 && Character.isWhitespace(s.charAt(i)));
+        return s.subSequence(0, i + 1);
     }
 }
diff --git a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
index f16bb542c..0023a9f88 100644
--- a/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/repository/TimelineRepository.kt
@@ -1,6 +1,8 @@
 package com.keylesspalace.tusky.repository
 
 import android.text.SpannedString
+import androidx.core.text.parseAsHtml
+import androidx.core.text.toHtml
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.keylesspalace.tusky.db.*
@@ -9,7 +11,6 @@ import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.repository.TimelineRequestMode.DISK
 import com.keylesspalace.tusky.repository.TimelineRequestMode.NETWORK
 import com.keylesspalace.tusky.util.Either
-import com.keylesspalace.tusky.util.HtmlConverter
 import com.keylesspalace.tusky.util.dec
 import com.keylesspalace.tusky.util.inc
 import io.reactivex.Single
@@ -40,8 +41,7 @@ class TimelineRepositoryImpl(
         private val timelineDao: TimelineDao,
         private val mastodonApi: MastodonApi,
         private val accountManager: AccountManager,
-        private val gson: Gson,
-        private val htmlConverter: HtmlConverter
+        private val gson: Gson
 ) : TimelineRepository {
 
     init {
@@ -150,7 +150,7 @@ class TimelineRepositoryImpl(
 
             for (status in statuses) {
                 timelineDao.insertInTransaction(
-                        status.toEntity(accountId, htmlConverter, gson),
+                        status.toEntity(accountId, gson),
                         status.account.toEntity(accountId, gson),
                         status.reblog?.account?.toEntity(accountId, gson)
                 )
@@ -214,7 +214,7 @@ class TimelineRepositoryImpl(
                     inReplyToId = status.inReplyToId,
                     inReplyToAccountId = status.inReplyToAccountId,
                     reblog = null,
-                    content = status.content?.let(htmlConverter::fromHtml) ?: SpannedString(""),
+                    content = status.content?.parseAsHtml() ?: SpannedString(""),
                     createdAt = Date(status.createdAt),
                     emojis = emojis,
                     reblogsCount = status.reblogsCount,
@@ -269,7 +269,7 @@ class TimelineRepositoryImpl(
                     inReplyToId = status.inReplyToId,
                     inReplyToAccountId = status.inReplyToAccountId,
                     reblog = null,
-                    content = status.content?.let(htmlConverter::fromHtml) ?: SpannedString(""),
+                    content = status.content?.parseAsHtml() ?: SpannedString(""),
                     createdAt = Date(status.createdAt),
                     emojis = emojis,
                     reblogsCount = status.reblogsCount,
@@ -362,7 +362,6 @@ fun Placeholder.toEntity(timelineUserId: Long): TimelineStatusEntity {
 }
 
 fun Status.toEntity(timelineUserId: Long,
-                    htmlConverter: HtmlConverter,
                     gson: Gson): TimelineStatusEntity {
     val actionable = actionableStatus
     return TimelineStatusEntity(
@@ -372,7 +371,7 @@ fun Status.toEntity(timelineUserId: Long,
             authorServerId = actionable.account.id,
             inReplyToId = actionable.inReplyToId,
             inReplyToAccountId = actionable.inReplyToAccountId,
-            content = htmlConverter.toHtml(actionable.content),
+            content = actionable.content.toHtml(),
             createdAt = actionable.createdAt.time,
             emojis = actionable.emojis.let(gson::toJson),
             reblogsCount = actionable.reblogsCount,
@@ -385,7 +384,7 @@ fun Status.toEntity(timelineUserId: Long,
             visibility = actionable.visibility,
             attachments = actionable.attachments.let(gson::toJson),
             mentions = actionable.mentions.let(gson::toJson),
-            application = actionable.let(gson::toJson),
+            application = actionable.application.let(gson::toJson),
             reblogServerId = reblog?.id,
             reblogAccountId = reblog?.let { this.account.id },
             poll = actionable.poll.let(gson::toJson),
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/HtmlConverter.kt b/app/src/main/java/com/keylesspalace/tusky/util/HtmlConverter.kt
deleted file mode 100644
index 72efc28c6..000000000
--- a/app/src/main/java/com/keylesspalace/tusky/util/HtmlConverter.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.keylesspalace.tusky.util
-
-import android.text.Spanned
-
-/**
- * Abstracting away Android-specific things.
- */
-interface HtmlConverter {
-    fun fromHtml(html: String): Spanned
-
-    fun toHtml(text: Spanned): String
-}
-
-internal class HtmlConverterImpl : HtmlConverter {
-    override fun fromHtml(html: String): Spanned {
-        return HtmlUtils.fromHtml(html)
-    }
-
-    override fun toHtml(text: Spanned): String {
-        return HtmlUtils.toHtml(text)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/HtmlUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/HtmlUtils.java
deleted file mode 100644
index cba8f2fab..000000000
--- a/app/src/main/java/com/keylesspalace/tusky/util/HtmlUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2017 Andrew Dawson
- *
- * This file is a part of Tusky.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
- * see <http://www.gnu.org/licenses>. */
-
-package com.keylesspalace.tusky.util;
-
-import android.os.Build;
-import android.text.Html;
-import android.text.Spanned;
-
-public class HtmlUtils {
-    private static CharSequence trimTrailingWhitespace(CharSequence s) {
-        int i = s.length();
-        do {
-            i--;
-        } while (i >= 0 && Character.isWhitespace(s.charAt(i)));
-        return s.subSequence(0, i + 1);
-    }
-
-    public static Spanned fromHtml(String html) {
-        Spanned result;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            result = Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY);
-        } else {
-            result = Html.fromHtml(html);
-        }
-        /* Html.fromHtml returns trailing whitespace if the html ends in a </p> tag, which
-         * all status contents do, so it should be trimmed. */
-        return (Spanned) trimTrailingWhitespace(result);
-    }
-
-    public static String toHtml(Spanned text) {
-        String result;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            result = Html.toHtml(text, Html.TO_HTML_PARAGRAPH_LINES_CONSECUTIVE);
-        } else {
-            result = Html.toHtml(text);
-        }
-        return result;
-    }
-}
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
index 98660bc39..79c0c4b84 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt
@@ -171,15 +171,12 @@ class StatusViewHelper(private val itemView: View) {
             sensitiveMediaWarning.visibility = View.GONE
             sensitiveMediaShow.visibility = View.GONE
         } else {
-
-            val hiddenContentText: String = if (sensitive) {
+            sensitiveMediaWarning.text =  if (sensitive) {
                 context.getString(R.string.status_sensitive_media_title)
             } else {
                 context.getString(R.string.status_media_hidden_title)
             }
 
-            sensitiveMediaWarning.text = HtmlUtils.fromHtml(hiddenContentText)
-
             sensitiveMediaWarning.visibility = if (showingContent) View.GONE else View.VISIBLE
             sensitiveMediaShow.visibility = if (showingContent) View.VISIBLE else View.GONE
             sensitiveMediaShow.setOnClickListener { v ->
diff --git a/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt b/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt
index 729893215..b6eefd713 100644
--- a/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/viewdata/PollViewData.kt
@@ -18,10 +18,10 @@ package com.keylesspalace.tusky.viewdata
 import android.content.Context
 import android.text.SpannableStringBuilder
 import android.text.Spanned
+import androidx.core.text.parseAsHtml
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.entity.Poll
 import com.keylesspalace.tusky.entity.PollOption
-import com.keylesspalace.tusky.util.HtmlUtils
 import java.util.*
 import kotlin.math.roundToInt
 
@@ -52,7 +52,7 @@ fun calculatePercent(fraction: Int, totalVoters: Int?, totalVotes: Int): Int {
 }
 
 fun buildDescription(title: String, percent: Int, context: Context): Spanned {
-    return SpannableStringBuilder(HtmlUtils.fromHtml(context.getString(R.string.poll_percent_format, percent)))
+    return SpannableStringBuilder(context.getString(R.string.poll_percent_format, percent).parseAsHtml())
         .append(" ")
         .append(title)
 }
diff --git a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
index f80f57b8c..a3db3b448 100644
--- a/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/fragment/TimelineRepositoryTest.kt
@@ -1,6 +1,8 @@
 package com.keylesspalace.tusky.fragment
 
-import android.text.Spanned
+import android.text.SpannableString
+import android.text.SpannedString
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.google.gson.Gson
 import com.keylesspalace.tusky.SpanUtilsTest
 import com.keylesspalace.tusky.db.AccountEntity
@@ -12,7 +14,6 @@ import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.repository.*
 import com.keylesspalace.tusky.util.Either
-import com.keylesspalace.tusky.util.HtmlConverter
 import com.nhaarman.mockitokotlin2.isNull
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
@@ -24,14 +25,18 @@ import io.reactivex.schedulers.TestScheduler
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.any
 import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.Mock
 import org.mockito.MockitoAnnotations
+import org.robolectric.annotation.Config
 import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.collections.ArrayList
 
+@Config(sdk = [28])
+@RunWith(AndroidJUnit4::class)
 class TimelineRepositoryTest {
     @Mock
     lateinit var timelineDao: TimelineDao
@@ -56,15 +61,6 @@ class TimelineRepositoryTest {
             domain = "domain.com",
             isActive = true
     )
-    private val htmlConverter = object : HtmlConverter {
-        override fun fromHtml(html: String): Spanned {
-            return SpanUtilsTest.FakeSpannable(html)
-        }
-
-        override fun toHtml(text: Spanned): String {
-            return text.toString()
-        }
-    }
 
     @Before
     fun setup() {
@@ -74,8 +70,7 @@ class TimelineRepositoryTest {
         gson = Gson()
         testScheduler = TestScheduler()
         RxJavaPlugins.setIoSchedulerHandler { testScheduler }
-        subject = TimelineRepositoryImpl(timelineDao, mastodonApi, accountManager, gson,
-                htmlConverter)
+        subject = TimelineRepositoryImpl(timelineDao, mastodonApi, accountManager, gson)
     }
 
     @Test
@@ -97,7 +92,7 @@ class TimelineRepositoryTest {
         verify(timelineDao).insertStatusIfNotThere(Placeholder("1").toEntity(account.id))
         for (status in statuses) {
             verify(timelineDao).insertInTransaction(
-                    status.toEntity(account.id, htmlConverter, gson),
+                    status.toEntity(account.id, gson),
                     status.account.toEntity(account.id, gson),
                     null
             )
@@ -129,7 +124,7 @@ class TimelineRepositoryTest {
         // We assume for now that overlapped one is inserted but it's not that important
         for (status in response) {
             verify(timelineDao).insertInTransaction(
-                    status.toEntity(account.id, htmlConverter, gson),
+                    status.toEntity(account.id, gson),
                     status.account.toEntity(account.id, gson),
                     null
             )
@@ -159,7 +154,7 @@ class TimelineRepositoryTest {
         verify(timelineDao).deleteRange(account.id, response.last().id, response.first().id)
         for (status in response) {
             verify(timelineDao).insertInTransaction(
-                    status.toEntity(account.id, htmlConverter, gson),
+                    status.toEntity(account.id, gson),
                     status.account.toEntity(account.id, gson),
                     null
             )
@@ -201,7 +196,7 @@ class TimelineRepositoryTest {
         // We assume for now that overlapped one is inserted but it's not that important
         for (status in response) {
             verify(timelineDao).insertInTransaction(
-                    status.toEntity(account.id, htmlConverter, gson),
+                    status.toEntity(account.id, gson),
                     status.account.toEntity(account.id, gson),
                     null
             )
@@ -246,7 +241,7 @@ class TimelineRepositoryTest {
 
         for (status in response) {
             verify(timelineDao).insertInTransaction(
-                    status.toEntity(account.id, htmlConverter, gson),
+                    status.toEntity(account.id, gson),
                     status.account.toEntity(account.id, gson),
                     null
             )
@@ -263,7 +258,7 @@ class TimelineRepositoryTest {
         val status = makeStatus("2")
         val dbStatus = makeStatus("1")
         val dbResult = TimelineStatusWithAccount()
-        dbResult.status = dbStatus.toEntity(account.id, htmlConverter, gson)
+        dbResult.status = dbStatus.toEntity(account.id, gson)
         dbResult.account = status.account.toEntity(account.id, gson)
 
         whenever(mastodonApi.homeTimelineSingle(any(), any(), any()))
@@ -297,7 +292,7 @@ class TimelineRepositoryTest {
         return Status(
                 id = id,
                 account = account,
-                content = SpanUtilsTest.FakeSpannable("hello$id"),
+                content = SpannableString("hello$id"),
                 createdAt = Date(),
                 emojis = listOf(),
                 reblogsCount = 3,
@@ -328,7 +323,7 @@ class TimelineRepositoryTest {
                 localUsername = "test$id",
                 username = "test$id@example.com",
                 displayName = "Example Account $id",
-                note = SpanUtilsTest.FakeSpannable("Note! $id"),
+                note = SpannableString("Note! $id"),
                 url = "https://example.com/@test$id",
                 avatar = "avatar$id",
                 header = "Header$id",

From a5416abb21ac7007cb6e634c4ac96a06ec94da3f Mon Sep 17 00:00:00 2001
From: Levi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>
Date: Fri, 3 Apr 2020 19:04:06 +0200
Subject: [PATCH 40/42] Add missing error handler for mute conversation
 invocation (#1746)

---
 .../main/java/com/keylesspalace/tusky/fragment/SFragment.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
index 5b475a046..935a02e7b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
@@ -318,6 +318,7 @@ public abstract class SFragment extends BaseFragment implements Injectable {
                 }
                 case R.id.status_mute_conversation: {
                     timelineCases.muteConversation(status, status.getMuted() == null || !status.getMuted())
+                            .onErrorReturnItem(status)
                             .observeOn(AndroidSchedulers.mainThread())
                             .as(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))
                             .subscribe();

From c80fa68dbeb0fa4292139156fb6e03d11c014531 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Mon, 6 Apr 2020 11:46:38 +0200
Subject: [PATCH 41/42] upgrade dependencies, fix some warnings (#1747)

* upgrade dependencies, fix some warnings

* fix tests
---
 app/build.gradle                              |  20 +++++++++---------
 .../res/mipmap-hdpi/ic_shortcut_compose.png   | Bin 4047 -> 0 bytes
 .../res/mipmap-mdpi/ic_shortcut_compose.png   | Bin 2352 -> 0 bytes
 .../res/mipmap-xhdpi/ic_shortcut_compose.png  | Bin 6118 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_shortcut_compose.png | Bin 10037 -> 0 bytes
 .../mipmap-xxxhdpi/ic_shortcut_compose.png    | Bin 12931 -> 0 bytes
 .../keylesspalace/tusky/AccountActivity.kt    |   8 +++----
 .../tusky/AccountsInListFragment.kt           |   8 +++----
 .../com/keylesspalace/tusky/ListsActivity.kt  |   2 +-
 .../tusky/TabPreferenceActivity.kt            |   2 +-
 .../tusky/fragment/AccountMediaFragment.kt    |   8 +++----
 .../tusky/fragment/TimelineFragment.java      |   2 +-
 .../tusky/fragment/ViewImageFragment.kt       |   4 ++--
 .../tusky/fragment/ViewVideoFragment.kt       |   6 +++---
 app/src/main/res/values/dimens.xml            |   1 -
 .../com/keylesspalace/tusky/FilterTest.kt     |   5 +++++
 .../keylesspalace/tusky/TuskyApplication.kt   |   4 ----
 build.gradle                                  |   4 ++--
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew.bat                                   |   3 +++
 20 files changed, 40 insertions(+), 39 deletions(-)
 delete mode 100644 app/src/blue/res/mipmap-hdpi/ic_shortcut_compose.png
 delete mode 100644 app/src/blue/res/mipmap-mdpi/ic_shortcut_compose.png
 delete mode 100644 app/src/blue/res/mipmap-xhdpi/ic_shortcut_compose.png
 delete mode 100644 app/src/blue/res/mipmap-xxhdpi/ic_shortcut_compose.png
 delete mode 100644 app/src/blue/res/mipmap-xxxhdpi/ic_shortcut_compose.png

diff --git a/app/build.gradle b/app/build.gradle
index 1defe9f78..8e3931eb2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,23 +96,23 @@ project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 }
 
 ext.lifecycleVersion = "2.2.0"
-ext.roomVersion = '2.2.4'
-ext.retrofitVersion = '2.7.1'
-ext.okhttpVersion = '4.3.1'
-ext.glideVersion = '4.10.0'
-ext.daggerVersion = '2.26'
+ext.roomVersion = '2.2.5'
+ext.retrofitVersion = '2.8.1'
+ext.okhttpVersion = '4.4.0'
+ext.glideVersion = '4.11.0'
+ext.daggerVersion = '2.27'
 
 // if libraries are changed here, they should also be changed in LicenseActivity
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation "androidx.core:core-ktx:1.2.0"
-    implementation "androidx.appcompat:appcompat:1.2.0-alpha02"
-    implementation "androidx.fragment:fragment-ktx:1.2.2"
+    implementation "androidx.appcompat:appcompat:1.2.0-beta01"
+    implementation "androidx.fragment:fragment-ktx:1.2.4"
     implementation "androidx.browser:browser:1.2.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.recyclerview:recyclerview:1.1.0"
-    implementation "androidx.exifinterface:exifinterface:1.1.0"
+    implementation "androidx.exifinterface:exifinterface:1.2.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.preference:preference:1.1.0"
     implementation "androidx.sharetarget:sharetarget:1.0.0-rc01"
@@ -122,7 +122,7 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     implementation "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycleVersion"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
-    implementation "androidx.paging:paging-runtime-ktx:2.1.1"
+    implementation "androidx.paging:paging-runtime-ktx:2.1.2"
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation "androidx.room:room-runtime:$roomVersion"
     implementation "androidx.room:room-rxjava2:$roomVersion"
@@ -137,7 +137,7 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttpVersion"
 
-    implementation "org.conscrypt:conscrypt-android:2.2.1"
+    implementation "org.conscrypt:conscrypt-android:2.4.0"
 
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion"
diff --git a/app/src/blue/res/mipmap-hdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-hdpi/ic_shortcut_compose.png
deleted file mode 100644
index 03ac90029135cae6aebe5cb339f2f49e83e4d5af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4047
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
Bs;dA1

diff --git a/app/src/blue/res/mipmap-mdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-mdpi/ic_shortcut_compose.png
deleted file mode 100644
index 2ba7f82bcbf4494f7df013e6740089193c33588e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2352
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
W-6Q6E>m>C60000<MNUMnLSTX_rhbS3

diff --git a/app/src/blue/res/mipmap-xhdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-xhdpi/ic_shortcut_compose.png
deleted file mode 100644
index 9ec8f40c1abca26e8d1408823b1573eb21af5bb0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6118
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

diff --git a/app/src/blue/res/mipmap-xxhdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-xxhdpi/ic_shortcut_compose.png
deleted file mode 100644
index 1ad9ff5ae3829f54a01e22184fd4ecd8fa93f5d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10037
zcmV-5C(77~P)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV001WZNkl<Zc-rlq
z33ye-*~c%CeZO1oP1qsGCVN3P6%>(JKm@{WSd$>4AQlyrO$oB&Zm|d?0l!bhB4u$w
z7A;B_eTrH?ZA;tlYZZ&uR;`MVg!9ciGw0rO&YhVvbMDP0VD9tG6CQH6bLN--`+whe
z&KZ}h;nDDDcr-j39u1F%$Hn{58o8D)Z;VILb4`Rpe;&N1;qe261VeBn0T1|hR3M<&
zTHmh$u1if-bWp_4_04!XGk4ZAfxKIHw#+YmrbE-Rs&4tERXt&le?QX!eh1Hi=h{LN
z0;>V2iwhb()G!{w>0AB5**p8>mF<|4Kf7vqe%X#~!Lq8?^2(}C<ds(aFZ%f}G|r$=
zjYcgR8XdLt|IXm&kmsI&*TQ?id%=6cd&6gNfr?u38Xob32L0uOYM@CjMw9zwep%IV
zH0h@eP#8vK6eHsOP6x|&yp=b*>IwL4_zpyc8epnl4?R2?9uQjcW>;R16k;Qq$hWCt
zut2E|mQ_~6$SbX^A)}&}jLP%k5qcheUHE;_|FOY3gTD)WC-mJ&_%j}d9_AVz7e;N+
z1O#SRUV}o(V@PFAMgT)6ISdH~L93&2UWY66nHH6T?+D*DSh{nt=?|bmmFoCmIk{kH
z(O>mqG%4?!pee07kNpZ!h`NMD0V*9R_--bk-p9v)jwRxcq~TFF;N;KVF(9vWM<qJ>
z-<U&FRW<$VcRbnoL?NVx^UtZk;nNc8zJX(cV`~5@mf#ppV17x(5OktnwHQ`iX`%;Z
z_71fX8>ni+FollkRrFrh@y<iTL#log_6AMMD*B<5x}O2gd1Y8^!Pu!V<N%Wma}1F7
z=a*FVH<|4Qe`J?gg~18V-qwnSD*c4&-bPJjBw=ZKi~5j;N&%*@SJFM*j!HNetaH@x
zV5*MRC|Fu~7dm-gg-@bHm=Y=t3zBDIJa}L^hRK-0eFf(vq(BX7WHrgU&#CH9>o?M&
ziVckw7|x{6`LEaw0a#q1>|wHows%Zn?Fa9TN;fBl((>6=_nW~HXH;@ZQ-{DP17%ew
z6_6_QRth;k=v=YR;SaAMh#rAim95c9dEKHq3g9>d=GOm??N9>B2$MWW7BzYu&K;}N
zap|`pbfa9deH=PrU&@3lX>b&PX?E+g<}p`cSYE3H6*I&|dL?dQlByA$yTGii<5}nS
zlJ`5ovZ~e2R7U|E5i}7{Jf}GLP)WmN2a=>31xvTDL8r9QrR|GomeslFxg>PZKM$wo
zm9;SihXsr*D7QT?KV;zI0i_619v`HdP<y0g+wOwGN0KkiRG%8XW;3^V=&}l7$l`}9
z4md)EQGsNa!cYN=0}~e{hDVYJX$YcU<xgDiyR^(T{cFI5!LrH^DLm)YRHv@Mu|RRV
z!jJ(fW+2&{>|kl-IeczsZT%>B>LYD04JFdyDcRl`9o(s?;NgTSGdLn>B0*^$F<y`y
zk*|#eOAaP3NTRT20}(pkr*exQ>UwcQL?tv>wzU&FsL%0%l~taT0Y?ZA)8B}ch6fD;
zjCl$}0F@d{vLGo!G;`}ebEj<Rc5#L?N`2nUEiHqkRiCK9W2ZV?#j!%e1I7fx&to`P
zU>Sg7!6X8S8P+00nh2u6j4h{f$3Jk9g)^E)wwUyU8y&<4F@Z-)al%Stg2oP*`MaYZ
zwm`{(#PCQGYQ%>K{ha>Phrz-{{);2U*9%!i%aelPY)cXz#c(AIQAV{<0p>-8Aq$jM
znXDm>4^q?+(Ldb4^v%C<^(#uP=f%cQDZLT;(!12)+38$$xQZi!hC*<Md9;um*4GKa
z5~vbWk&MR~D~L+AYk}e?_Mo|GY?-Ti7rGEU73HGpvJoCrVNeDhTX1;Ln1L|^vBx|X
zNDS+1SYXM(6akWg8Yw^oa}k`iP0PLcvGurOUGG8}b@_QE6*n2y@SL}Y$IkEAsSYDl
zNrA(I<rfNr2b2XSD@YuOm>|UtBD_E?IOAtpVBGqN^(!-@GzX_W35CKhcniRk!j`cZ
z$jq!5p~?!52^uRf94PMGD>v+*V!>n$ak6R@JBaWCH8fBE^4+xPvU*~w4ZbJ5B%?Zd
zcx+V15je82?6VmvV3}bOgQWW-qZ&m45i7-qxdA_P^P_K}Icsv^{Sc`wGzyk%Um^58
zlG&DXco^WY)J6iBmOrr{Qcy{Ow3`hQOO2Eu+98A}ICG2Uo49T*_Cpt}K15A(VEWc8
z<b02_uoW`OHmbt~hXYI)i2YFx7FYt176?F+4rx(Ag#A!p+LM}Z)B}SsM1z(mT&U31
z7=58%*@rG?VM`1T!x-CuV++kf$zcPN6iB?V788hU+8#8N<xY9z9W;lD@egG*bmh(3
zHecTNSVC9K;1PjiR2v>F2VyXIV3|QGxNE<5<*Gy4unkAFE6ZQg3Ks5V7;THejs--#
zP=>NH|G3qQ;~UCIC9_d}@xv{UtN#}XU6Bjmg{GNR=ZS!a?|00q!}2&BaCp$%^^)@;
z1=Bw5vU?6_PaOWEcJlPs+E?G5)&BI4ueC=Hex!9=wBJ6Y(Q<{YCt~!@_z;o1iR2bP
z`fva6+uIR{;!&k0-ls8=z%7nK7pu-Ar93Yh;1R118ytIRTHW=s)R2QI3{vkEuW1KP
ze4^FX)|y65O^tT&{Zm@EB`?viW(N`9SUd7V*ib*M<&Iyw6IZG0Jguk38M*jAp*wi7
zjI*d%XsbLNcx*$K1UNic?lz8BB!=PnJgDer_E>&U+xxpuw6o`GA^?I>jUamd*Z-&W
zUj9lbQwtX%MG!qN36U_A5ko!o@mk-g`{H1ziNt|%-Yus-vcAWVs>cEzJ8+a>c|{E>
z1590(9@Kt;;5k>#hQ|oeo_GGPbzXeH2BH_l5DEQ|K!s*))BF?Gy@YE+br!~S^_j7G
zaA-ligRCnubVUP??sYh-qYBPFugVPxkov4VtnE8-3c*n;ghw9$8HBlB%U%g(Y3y)j
zfJkJjEul<UrABiZD1Kb?jks@k-Kh{&pI}MFUb29@q9!Jx%Ty%f8D=&-T-9NMBMZzy
zn_&-C*JX#a{Rkdj*b*txb10l)i0)uO#7gn45IM=p&|HEF`Npk1ST`!9t55NheRxGf
zJLAmmtXq3qv4e*T4iA<^;n8~0YusUc9t)}-_a8=KOI~?c5P=ef!`X`hh&ZNNn3XYA
zh<Kr!AJcq4zH4yoRVb8sRXi1)`otI>V_I%C$5wb);79<Y0#nB&hqPU9e{Ab{WWpJE
zB5bS|2q5D6A&F2HX{c*(Mpm>c#u*u{`*@2sHs#fQq|$a?=o0xJMdeWeCjyAYht!AV
zJvtzO9zJwZIdqA#Go0e<O2qL)LKPAiYGz$%@}@7d2F)xW>xPP&#H#AtI5^{HcXF3%
z@YIJ}^I;SV^%KJ?5{i^Z1s*FnOfU{h3_eU9mK@gBzVgSIK?HRoQ?Zc=5i69bs!#=3
zlbXQv&6;o2(&bo%qF*zF`y((C@=CV9%>qct`!KufywJr;)m4>;p*TEP?sYI&Kv9Su
zJ^W|wKWENG4G|O@A3gYoP}?Iilrao7uQtReE=H^wf*#rUweO)hPa$(3O^=LvAAj-V
z0}c0GW}4^d)rS$fqJrmDf#QgvX>%Wch+ztY)Op!q?U6%&MgY`C4H2|Gpm%0A)iR-s
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
LNkvXXu0mjf6n6`+

diff --git a/app/src/blue/res/mipmap-xxxhdpi/ic_shortcut_compose.png b/app/src/blue/res/mipmap-xxxhdpi/ic_shortcut_compose.png
deleted file mode 100644
index a1d41bcef64c02b3da588e65e54e10f21abaf617..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12931
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
Yg)p+MkoDjGTmsO3XrNJ}W*7PY0Cv{oWdHyG

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
index 333eb09d1..485f6a8a6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt
@@ -52,8 +52,6 @@ import com.keylesspalace.tusky.components.compose.ComposeActivity
 import com.keylesspalace.tusky.components.report.ReportActivity
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.Account
-import com.keylesspalace.tusky.entity.Field
-import com.keylesspalace.tusky.entity.IdentityProof
 import com.keylesspalace.tusky.entity.Relationship
 import com.keylesspalace.tusky.interfaces.ActionButtonActivity
 import com.keylesspalace.tusky.interfaces.LinkListener
@@ -311,7 +309,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
      * Subscribe to data loaded at the view model
      */
     private fun subscribeObservables() {
-        viewModel.accountData.observe(this, Observer<Resource<Account>> {
+        viewModel.accountData.observe(this, Observer {
             when (it) {
                 is Success -> onAccountChanged(it.data)
                 is Error -> {
@@ -321,7 +319,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 }
             }
         })
-        viewModel.relationshipData.observe(this, Observer<Resource<Relationship>> {
+        viewModel.relationshipData.observe(this, Observer {
             val relation = it?.data
             if (relation != null) {
                 onRelationshipChanged(relation)
@@ -334,7 +332,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
             }
 
         })
-        viewModel.accountFieldData.observe(this, Observer<List<Either<IdentityProof, Field>>> {
+        viewModel.accountFieldData.observe(this, Observer {
             accountFieldAdapter.fields = it
             accountFieldAdapter.notifyDataSetChanged()
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
index 9477b8440..06edd80bb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
@@ -77,7 +77,7 @@ class AccountsInListFragment : DialogFragment(), Injectable {
         super.onCreate(savedInstanceState)
         setStyle(STYLE_NORMAL, R.style.TuskyDialogFragmentStyle)
         viewModel = viewModelFactory.create(AccountsInListViewModel::class.java)
-        val args = arguments!!
+        val args = requireArguments()
         listId = args.getString(LIST_ID_ARG)!!
         listName = args.getString(LIST_NAME_ARG)!!
 
@@ -255,12 +255,12 @@ class AccountsInListFragment : DialogFragment(), Injectable {
                 loadAvatar(account.avatar, avatar, radius, animateAvatar)
 
                 rejectButton.apply {
-                    if (inAList) {
+                    contentDescription = if (inAList) {
                         setImageResource(R.drawable.ic_reject_24dp)
-                        contentDescription = getString(R.string.action_remove_from_list)
+                        getString(R.string.action_remove_from_list)
                     } else {
                         setImageResource(R.drawable.ic_plus_24dp)
-                        contentDescription = getString(R.string.action_add_to_list)
+                        getString(R.string.action_add_to_list)
                     }
                 }
             }
diff --git a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
index 54aca8971..539dcfe01 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
@@ -135,7 +135,7 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector {
 
         val positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE)
         editText.onTextChanged { s, _, _, _ ->
-            positiveButton.isEnabled = !s.isNullOrBlank()
+            positiveButton.isEnabled = !s.isBlank()
         }
         editText.setText(list?.title)
         editText.text?.let { editText.setSelection(it.length) }
diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
index 864a7208a..26e85deba 100644
--- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
@@ -277,7 +277,7 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
         addTabAdapter.updateData(addableTabs)
 
         maxTabsInfo.visible(addableTabs.size == 0 || currentTabs.size >= MAX_TAB_COUNT)
-        currentTabsAdapter.setRemoveButtonVisible(currentTabs.size > MIN_TAB_COUNT);
+        currentTabsAdapter.setRemoveButtonVisible(currentTabs.size > MIN_TAB_COUNT)
     }
 
     override fun onStartDelete(viewHolder: RecyclerView.ViewHolder) {
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt
index 0f89c3e00..74c97b6ca 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt
@@ -199,10 +199,10 @@ class AccountMediaFragment : BaseFragment(), RefreshableFragment, Injectable {
                     val itemCount = layoutManager.itemCount
                     val lastItem = layoutManager.findLastCompletelyVisibleItemPosition()
                     if (itemCount <= lastItem + 3 && fetchingStatus == FetchingStatus.NOT_FETCHING) {
-                        statuses.lastOrNull()?.let { last ->
-                            Log.d(TAG, "Requesting statuses with max_id: ${last.id}, (bottom)")
+                        statuses.lastOrNull()?.let { (id) ->
+                            Log.d(TAG, "Requesting statuses with max_id: ${id}, (bottom)")
                             fetchingStatus = FetchingStatus.FETCHING_BOTTOM
-                            currentCall = api.accountStatuses(accountId, last.id, null, null, null, true, null)
+                            currentCall = api.accountStatuses(accountId, id, null, null, null, true, null)
                             currentCall?.enqueue(bottomCallback)
                         }
                     }
@@ -254,7 +254,7 @@ class AccountMediaFragment : BaseFragment(), RefreshableFragment, Injectable {
                 if (view != null && activity != null) {
                     val url = items[currentIndex].attachment.url
                     ViewCompat.setTransitionName(view, url)
-                    val options = ActivityOptionsCompat.makeSceneTransitionAnimation(activity!!, view, url)
+                    val options = ActivityOptionsCompat.makeSceneTransitionAnimation(requireActivity(), view, url)
                     startActivity(intent, options.toBundle())
                 } else {
                     startActivity(intent)
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 0c20cfafe..7cbfde5ef 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -212,7 +212,7 @@ public class TimelineFragment extends SFragment implements
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Bundle arguments = Objects.requireNonNull(getArguments());
+        Bundle arguments = requireArguments();
         kind = Kind.valueOf(arguments.getString(KIND_ARG));
         if (kind == Kind.TAG
                 || kind == Kind.USER
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
index 1c3672519..2831100db 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
@@ -89,7 +89,7 @@ class ViewImageFragment : ViewMediaFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        toolbar = activity!!.toolbar
+        toolbar = requireActivity().toolbar
         this.transition = BehaviorSubject.create()
         return inflater.inflate(R.layout.fragment_view_image, container, false)
     }
@@ -97,7 +97,7 @@ class ViewImageFragment : ViewMediaFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val arguments = this.arguments!!
+        val arguments = this.requireArguments()
         val attachment = arguments.getParcelable<Attachment>(ARG_ATTACHMENT)
         this.shouldStartTransition = arguments.getBoolean(ARG_START_POSTPONED_TRANSITION)
         val url: String?
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
index 0b3a23a70..09c29d473 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewVideoFragment.kt
@@ -136,12 +136,12 @@ class ViewVideoFragment : ViewMediaFragment() {
 
             progressBar.hide()
             mp.isLooping = true
-            if (arguments!!.getBoolean(ARG_START_POSTPONED_TRANSITION)) {
+            if (requireArguments().getBoolean(ARG_START_POSTPONED_TRANSITION)) {
                 videoView.start()
             }
         }
 
-        if (arguments!!.getBoolean(ARG_START_POSTPONED_TRANSITION)) {
+        if (requireArguments().getBoolean(ARG_START_POSTPONED_TRANSITION)) {
             mediaActivity.onBringUp()
         }
     }
@@ -151,7 +151,7 @@ class ViewVideoFragment : ViewMediaFragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
-        toolbar = activity!!.toolbar
+        toolbar = requireActivity().toolbar
         mediaActivity = activity as ViewMediaActivity
         return inflater.inflate(R.layout.fragment_view_video, container, false)
     }
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index daa6252ad..bbffc0a91 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,7 +7,6 @@
     <dimen name="compose_media_preview_margin">8dp</dimen>
     <dimen name="compose_media_preview_margin_bottom">0dp</dimen>
     <dimen name="compose_media_preview_size">120dp</dimen>
-    <dimen name="compose_options_margin">8dp</dimen>
     <dimen name="account_avatar_margin">14dp</dimen>
     <dimen name="tab_page_margin">16dp</dimen>
     <dimen name="status_line_margin_start">36dp</dimen>
diff --git a/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
index 8b0c916aa..12f7bab54 100644
--- a/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/FilterTest.kt
@@ -11,6 +11,7 @@ import com.keylesspalace.tusky.fragment.SFragment
 import com.keylesspalace.tusky.network.MastodonApi
 import com.nhaarman.mockitokotlin2.mock
 import okhttp3.Request
+import okio.Timeout
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
@@ -99,6 +100,10 @@ class FilterTest {
                         )
                 )
             }
+
+            override fun timeout(): Timeout {
+                throw Error("not implemented")
+            }
         })
 
         activity.mastodonApi = apiMock
diff --git a/app/src/test/java/com/keylesspalace/tusky/TuskyApplication.kt b/app/src/test/java/com/keylesspalace/tusky/TuskyApplication.kt
index aaa2b349e..7f82e2495 100644
--- a/app/src/test/java/com/keylesspalace/tusky/TuskyApplication.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/TuskyApplication.kt
@@ -18,13 +18,9 @@ package com.keylesspalace.tusky
 import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
-import android.util.Log
 import androidx.emoji.text.EmojiCompat
 import com.keylesspalace.tusky.util.LocaleManager
-import dagger.android.DispatchingAndroidInjector
-import dagger.android.HasAndroidInjector
 import de.c1710.filemojicompat.FileEmojiCompatConfig
-import javax.inject.Inject
 
 // override TuskyApplication for Robolectric tests, only initialize the necessary stuff
 class TuskyApplication : Application() {
diff --git a/build.gradle b/build.gradle
index 38f3d2b41..cb3ee21f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.3.70'
+    ext.kotlin_version = '1.3.71'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.1'
+        classpath 'com.android.tools.build:gradle:3.6.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6254d2d4a..6623300be 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 24467a141..9109989e3 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

From d44eada14066592977bd12b1ed8ad238f27fef58 Mon Sep 17 00:00:00 2001
From: Ivan Kupalov <charlag@tuta.io>
Date: Mon, 6 Apr 2020 19:28:43 +0200
Subject: [PATCH 42/42] Fix reblog confirm (#1723)

* Fix reblog confirmation default value

* Fix triggering reblog before confirming it

* Fix accidents caused by reblog confirmation
---
 .../tusky/adapter/StatusBaseViewHolder.java   | 19 +++++++++++--------
 .../conversation/ConversationsFragment.kt     |  2 +-
 .../fragments/ReportStatusesFragment.kt       |  2 +-
 .../fragments/SearchStatusesFragment.kt       |  2 +-
 .../tusky/fragment/TimelineFragment.java      |  4 ----
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index f808cb1bb..ae0dfdbb5 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -611,10 +611,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         sensitiveMediaShow.setVisibility(View.GONE);
     }
 
-    protected void setupButtons(final StatusActionListener listener, final String accountId,
+    protected void setupButtons(final StatusActionListener listener,
+                                final String accountId,
                                 final String statusContent,
                                 StatusDisplayOptions statusDisplayOptions) {
-
         avatar.setOnClickListener(v -> listener.onViewAccount(accountId));
         replyButton.setOnClickListener(v -> {
             int position = getAdapterPosition();
@@ -624,15 +624,18 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         });
         if (reblogButton != null) {
             reblogButton.setEventListener((button, buttonState) -> {
+                // return true to play animaion
                 int position = getAdapterPosition();
                 if (position != RecyclerView.NO_POSITION) {
-                    listener.onReblog(!buttonState, position);
-                }
-                if (statusDisplayOptions.confirmReblogs()) {
-                    showConfirmReblogDialog(listener, statusContent, buttonState, position);
-                    return false;
+                    if (statusDisplayOptions.confirmReblogs()) {
+                        showConfirmReblogDialog(listener, statusContent, buttonState, position);
+                        return false;
+                    } else {
+                        listener.onReblog(!buttonState, position);
+                        return true;
+                    }
                 } else {
-                    return true;
+                    return false;
                 }
             });
         }
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
index a91ed2f08..aa9559507 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
@@ -67,7 +67,7 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
                 showBotOverlay = preferences.getBoolean("showBotOverlay", true),
                 useBlurhash = preferences.getBoolean("useBlurhash", true),
                 cardViewMode = CardViewMode.NONE,
-                confirmReblogs = preferences.getBoolean("confirmReblogs", true)
+                confirmReblogs = preferences.getBoolean("confirmReblogs", false)
         )
 
 
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
index dad6fe1f5..08fbf40fb 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
@@ -118,7 +118,7 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
                 showBotOverlay = false,
                 useBlurhash = preferences.getBoolean("useBlurhash", true),
                 cardViewMode = CardViewMode.NONE,
-                confirmReblogs = preferences.getBoolean("confirmReblogs", true)
+                confirmReblogs = preferences.getBoolean("confirmReblogs", false)
         )
 
         adapter = StatusesAdapter(statusDisplayOptions,
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
index 4e5f64fbe..8ff67053b 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
@@ -83,7 +83,7 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
                 showBotOverlay = preferences.getBoolean("showBotOverlay", true),
                 useBlurhash = preferences.getBoolean("useBlurhash", true),
                 cardViewMode = CardViewMode.NONE,
-                confirmReblogs = preferences.getBoolean("confirmReblogs", true)
+                confirmReblogs = preferences.getBoolean("confirmReblogs", false)
         )
 
         searchRecyclerView.addItemDecoration(DividerItemDecoration(searchRecyclerView.context, DividerItemDecoration.VERTICAL))
diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
index 7cbfde5ef..8b7296308 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
@@ -585,10 +585,6 @@ public class TimelineFragment extends SFragment implements
     @Override
     public void onReblog(final boolean reblog, final int position) {
         final Status status = statuses.get(position).asRight();
-        doReblog(reblog, position, status);
-    }
-
-    private void doReblog(boolean reblog, int position, Status status) {
         timelineCases.reblog(status, reblog)
                 .observeOn(AndroidSchedulers.mainThread())
                 .as(autoDisposable(from(this, Lifecycle.Event.ON_DESTROY)))