Commit e0e72341 authored by Thomas's avatar Thomas
Browse files

- Fix: respect user's default quote policy when composing new posts

parent c59674b1
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -528,10 +528,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
                } else if (visibility == null && Helper.getCurrentAccount(ComposeActivity.this) != null && Helper.getCurrentAccount(ComposeActivity.this).mastodon_account != null && Helper.getCurrentAccount(ComposeActivity.this).mastodon_account.source != null) {
                    visibility = Helper.getCurrentAccount(ComposeActivity.this).mastodon_account.source.privacy;
                }
                if (quote_approval_policy == null && Helper.getCurrentAccount(ComposeActivity.this) != null && Helper.getCurrentAccount(ComposeActivity.this).mastodon_account != null && Helper.getCurrentAccount(ComposeActivity.this).mastodon_account.source != null) {
                    quote_approval_policy = Helper.getCurrentAccount(ComposeActivity.this).mastodon_account.source.quote_policy;
                }

                if(setMentionBooster) {
                    mentionBooster = (Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER);
                } else {
@@ -547,6 +543,10 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
                sharedDescription = b.getString(Helper.ARG_SHARE_DESCRIPTION, null);
                shareURL = b.getString(Helper.ARG_SHARE_URL, null);
            }
            // Set default quote policy from account settings
            if (quote_approval_policy == null && Helper.getCurrentAccount(ComposeActivity.this) != null && Helper.getCurrentAccount(ComposeActivity.this).mastodon_account != null && Helper.getCurrentAccount(ComposeActivity.this).mastodon_account.source != null) {
                quote_approval_policy = Helper.getCurrentAccount(ComposeActivity.this).mastodon_account.source.quote_policy;
            }
            Handler mainHandler = new Handler(Looper.getMainLooper());
            Runnable myRunnable = () -> {
                if (sharedContent != null && shareURL != null && sharedContent.compareTo(shareURL) == 0) {