Commit 898c5f7c authored by Thomas's avatar Thomas
Browse files

Fix issue #658 - Toggle cw does not honor choice

parent fbeea6a8

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

+3 −3
Original line number Diff line number Diff line
@@ -221,10 +221,10 @@ public class ComposeWorker extends Worker { 
                if (dataPost.scheduledDate == null) {

                    if (dataPost.statusEditId == null) {

                        statusCall = mastodonStatusesService.createStatus(null, dataPost.token, statuses.get(i).text, attachmentIds, poll_options, poll_expire_in,

                                poll_multiple, poll_hide_totals, in_reply_to_status, statuses.get(i).sensitive, statuses.get(i).spoiler_text, statuses.get(i).visibility.toLowerCase(), language);

                                poll_multiple, poll_hide_totals, in_reply_to_status, statuses.get(i).sensitive, statuses.get(i).spoilerChecked ? statuses.get(i).spoiler_text : null, statuses.get(i).visibility.toLowerCase(), language);

                    } else { //Status is edited

                        statusCall = mastodonStatusesService.updateStatus(null, dataPost.token, dataPost.statusEditId, statuses.get(i).text, attachmentIds, poll_options, poll_expire_in,

                                poll_multiple, poll_hide_totals, in_reply_to_status, statuses.get(i).sensitive, statuses.get(i).spoiler_text, statuses.get(i).visibility.toLowerCase(), language);

                                poll_multiple, poll_hide_totals, in_reply_to_status, statuses.get(i).sensitive, statuses.get(i).spoilerChecked ? statuses.get(i).spoiler_text : null, statuses.get(i).visibility.toLowerCase(), language);

                    }

                    try {

                        Response<Status> statusResponse = statusCall.execute();
@@ -285,7 +285,7 @@ public class ComposeWorker extends Worker { 
                    }

                } else {

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

                            poll_multiple, poll_hide_totals, in_reply_to_status, statuses.get(i).sensitive, statuses.get(i).spoiler_text, statuses.get(i).visibility.toLowerCase(), dataPost.scheduledDate, statuses.get(i).language);

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

                    try {

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

app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                statusDraft.setCursorToEnd = false;

                holder.binding.content.setSelection(holder.binding.content.getText().length());

            }

            if (statusDraft.spoiler_text != null && holder.binding.buttonSensitive.isChecked()) {

            if (statusDraft.spoiler_text != null) {

                holder.binding.contentSpoiler.setText(statusDraft.spoiler_text);

                holder.binding.contentSpoiler.setSelection(holder.binding.contentSpoiler.getText().length());

            } else {