Commit 1a370632 authored by Thomas's avatar Thomas
Browse files

Some fixes

parent b7265d6d

app/src/main/java/app/fedilab/android/activities/ComposeActivity.java

+12 −5
Original line number Diff line number Diff line
@@ -168,7 +168,6 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
            accountMention = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);

        }

        binding.toolbar.setPopupTheme(Helper.popupStyle());



        //Edit a scheduled status from server

        if (scheduledStatus != null) {

            statusDraft = new StatusDraft();
@@ -629,10 +628,18 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                    WorkManager.getInstance(ComposeActivity.this).cancelWorkById(statusDraft.workerUuid);

                }

            }

            if (statusReplies.size() > 0) {

                statusDraft.statusReplyList = statusReplies;

            }

            if (statusDrafts.size() > 0) {

                statusDraft.statusDraftList = statusDrafts;

            }

            if (statusDraft.instance == null) {

                statusDraft.instance = account.instance;

            }

            if (statusDraft.user_id == null) {

                statusDraft.user_id = account.user_id;

            }



            if (!canBeSent(statusDraft)) {

                return;