Mastodon/fedilab-Android-App
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Thomas 2022-07-02 18:39:03 +02:00
parent b7265d6de3
commit 1a37063295
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/app/fedilab/android/activities/ComposeActivity.java
View File

@ -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); accountMention = (app.fedilab.android.client.entities.api.Account) b.getSerializable(Helper.ARG_ACCOUNT_MENTION);
} }
binding.toolbar.setPopupTheme(Helper.popupStyle()); binding.toolbar.setPopupTheme(Helper.popupStyle());
//Edit a scheduled status from server //Edit a scheduled status from server
if (scheduledStatus != null) { if (scheduledStatus != null) {
statusDraft = new StatusDraft(); statusDraft = new StatusDraft();
@ -629,10 +628,18 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana
WorkManager.getInstance(ComposeActivity.this).cancelWorkById(statusDraft.workerUuid); WorkManager.getInstance(ComposeActivity.this).cancelWorkById(statusDraft.workerUuid);
} }
} }
statusDraft.statusReplyList = statusReplies; if (statusReplies.size() > 0) {
statusDraft.statusDraftList = statusDrafts; statusDraft.statusReplyList = statusReplies;
statusDraft.instance = account.instance; }
statusDraft.user_id = account.user_id; 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)) { if (!canBeSent(statusDraft)) {
return; return;