Commit 885451bd authored by Thomas's avatar Thomas
Browse files

- Fix #1369 quotes lost on scheduled posts

parent 6e380252

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

+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                    status.spoilerChecked = scheduledStatus.params.spoiler_text != null && !scheduledStatus.params.spoiler_text.isEmpty();

                    status.visibility = scheduledStatus.params.visibility;

                    status.quote_approval_policy = scheduledStatus.params.quote_approval_policy;

                    status.quote_id = scheduledStatus.params.quote_id != null ? scheduledStatus.params.quote_id : scheduledStatus.params.quoted_status_id;

                    statuses.add(status);

                    statusDraft.statusDraftList = statuses;

                }

app/src/main/java/app/fedilab/android/mastodon/client/endpoints/MastodonStatusesService.java

+4 −1
Original line number Diff line number Diff line
@@ -132,7 +132,10 @@ public interface MastodonStatusesService { 
            @Field("spoiler_text") String spoiler_text,

            @Field("visibility") String visibility,

            @Field("scheduled_at") String scheduled_at,

            @Field("language") String language

            @Field("language") String language,

            @Field("quote_approval_policy") String quote_approval_policy,

            @Field("quoted_status_id") String quoted_status_id,

            @Field("quote_id") String quote_id

    );



    //Get a specific status

app/src/main/java/app/fedilab/android/mastodon/client/entities/api/ScheduledStatus.java

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ public class ScheduledStatus implements Serializable { 
        public String idempotency;

        @SerializedName("in_reply_to_id")

        public String in_reply_to_id;

        @SerializedName("quoted_status_id")

        public String quoted_status_id;

        @SerializedName("quote_id")

        public String quote_id;

        @SerializedName("application_id")

        public String application_id;

    }

app/src/main/java/app/fedilab/android/mastodon/jobs/ComposeWorker.java

+3 −1
Original line number Diff line number Diff line
@@ -399,8 +399,10 @@ public class ComposeWorker extends Worker { 
                        }

                    }

                    String scheduledVisibility = statuses.get(i).visibility != null ? statuses.get(i).visibility.toLowerCase() : null;

                    String scheduledQuoteApprovalPolicy = statuses.get(i).quote_approval_policy != null ? statuses.get(i).quote_approval_policy.toLowerCase() : null;

                    Call<ScheduledStatus> scheduledStatusCall = mastodonStatusesService.createScheduledStatus(null, dataPost.token, statuses.get(i).text, attachmentIds, poll_options, poll_expire_in,

                            poll_multiple, poll_hide_totals, statuses.get(i).quote_id == null ? in_reply_to_status : null, statuses.get(i).sensitive, statuses.get(i).spoilerChecked ? statuses.get(i).spoiler_text : null, scheduledVisibility, dataPost.scheduledDate, statuses.get(i).language);

                            poll_multiple, poll_hide_totals, statuses.get(i).quote_id == null ? in_reply_to_status : null, statuses.get(i).sensitive, statuses.get(i).spoilerChecked ? statuses.get(i).spoiler_text : null, scheduledVisibility, dataPost.scheduledDate, statuses.get(i).language,

                            scheduledQuoteApprovalPolicy, statuses.get(i).quote_id, statuses.get(i).quote_id);

                    try {

                        Response<ScheduledStatus> statusResponse = scheduledStatusCall.execute();

app/src/main/java/app/fedilab/android/mastodon/viewmodel/mastodon/StatusesVM.java

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class StatusesVM extends AndroidViewModel { 
        scheduledStatusMutableLiveData = new MutableLiveData<>();

        new Thread(() -> {

            Call<ScheduledStatus> scheduledStatusCall = mastodonStatusesService.createScheduledStatus(idempotency_Key, token, text, media_ids, poll_options, poll_expire_in,

                    poll_multiple, poll_hide_totals, in_reply_to_id, sensitive, spoiler_text, visibility, scheduledAt, language);

                    poll_multiple, poll_hide_totals, in_reply_to_id, sensitive, spoiler_text, visibility, scheduledAt, language, null, null, null);

            ScheduledStatus scheduledStatus = null;

            if (scheduledStatusCall != null) {

                try {