Commit cc5f18be authored by Thomas's avatar Thomas
Browse files

Quote when composing

parent 5accc101

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

+11 −5
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
    private Uri photoFileUri;

    private ScheduledStatus scheduledStatus;

    private String visibility;

    private String quote_approval_policy;

    private Account accountMention;

    private String statusReplyId;

    private Account mentionBooster;
@@ -287,7 +288,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
        statusList.addAll(0, context.ancestors);

        statusList.add(initialStatus);

        statusList.add(statusDraft.statusDraftList.get(0));

        composeAdapter = new ComposeAdapter(statusList, context.ancestors.size(), account, accountMention, visibility, editMessageId);

        composeAdapter = new ComposeAdapter(statusList, context.ancestors.size(), account, accountMention, visibility, quote_approval_policy, editMessageId);

        composeAdapter.mediaDescriptionCallBack = this;

        composeAdapter.promptDraftListener = this;

        composeAdapter.manageDrafts = this;
@@ -526,6 +527,10 @@ 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_authorizations;

                }



                if(setMentionBooster) {

                    mentionBooster = (Account) b.getSerializable(Helper.ARG_MENTION_BOOSTER);

                } else {
@@ -569,6 +574,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                    status.sensitive = scheduledStatus.params.sensitive;

                    status.spoiler_text = scheduledStatus.params.spoiler_text;

                    status.visibility = scheduledStatus.params.visibility;

                    status.quote_approval_policy = scheduledStatus.params.quote_approval_policy;

                    statuses.add(status);

                    statusDraft.statusDraftList = statuses;

                }
@@ -636,7 +642,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                    }

                    int statusCount = statusList.size();

                    statusList.addAll(statusDraft.statusDraftList);

                    composeAdapter = new ComposeAdapter(statusList, statusCount, account, accountMention, visibility, editMessageId);

                    composeAdapter = new ComposeAdapter(statusList, statusCount, account, accountMention, visibility, quote_approval_policy, editMessageId);

                    composeAdapter.mediaDescriptionCallBack = this;

                    composeAdapter.manageDrafts = this;

                    composeAdapter.promptDraftListener = this;
@@ -709,7 +715,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                    }

                    //StatusDraftList at this point should only have one element

                    statusList.addAll(statusDraftList);

                    composeAdapter = new ComposeAdapter(statusList, statusCount, account, accountMention, visibility, editMessageId);

                    composeAdapter = new ComposeAdapter(statusList, statusCount, account, accountMention, visibility, quote_approval_policy, editMessageId);

                    composeAdapter.mediaDescriptionCallBack = this;

                    composeAdapter.manageDrafts = this;

                    composeAdapter.promptDraftListener = this;
@@ -724,7 +730,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                    statusDraftList.get(0).quote_id = statusQuoted.id;

                    //StatusDraftList at this point should only have one element

                    statusList.addAll(statusDraftList);

                    composeAdapter = new ComposeAdapter(statusList, statusCount, account, accountMention, visibility, editMessageId);

                    composeAdapter = new ComposeAdapter(statusList, statusCount, account, accountMention, visibility, quote_approval_policy, editMessageId);

                    composeAdapter.mediaDescriptionCallBack = this;

                    composeAdapter.manageDrafts = this;

                    composeAdapter.promptDraftListener = this;
@@ -734,7 +740,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                } else {

                    //Compose without replying

                    statusList.addAll(statusDraftList);

                    composeAdapter = new ComposeAdapter(statusList, 0, account, accountMention, visibility, editMessageId);

                    composeAdapter = new ComposeAdapter(statusList, 0, account, accountMention, visibility,quote_approval_policy, editMessageId);

                    composeAdapter.mediaDescriptionCallBack = this;

                    composeAdapter.manageDrafts = this;

                    composeAdapter.promptDraftListener = this;

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

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ public interface MastodonStatusesService { 
            @Field("spoiler_text") String spoiler_text,

            @Field("visibility") String visibility,

            @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,

            @Field("content_type") String content_type,

            @Field("local_only") Boolean local_only

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ public class ScheduledStatus implements Serializable { 
        public String spoiler_text;

        @SerializedName("visibility")

        public String visibility;

        @SerializedName("quote_approval_policy")

        public String quote_approval_policy;

        @SerializedName("scheduled_at")

        public Date scheduled_at;

        @SerializedName("poll")

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

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import java.util.List; 
public class Source implements Serializable {

    @SerializedName("privacy")

    public String privacy;

    @SerializedName("quote_authorizations")

    public String quote_authorizations;

    @SerializedName("sensitive")

    public boolean sensitive;

    @SerializedName("language")
@@ -36,6 +38,8 @@ public class Source implements Serializable { 
    public static class SourceParams implements Serializable {

        @SerializedName("privacy")

        public String privacy;

        @SerializedName("quote_authorizations")

        public String quote_authorizations;

        @SerializedName("sensitive")

        public boolean sensitive;

        @SerializedName("language")

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

+3 −0
Original line number Diff line number Diff line
@@ -55,10 +55,13 @@ public class Status implements Serializable, Cloneable { 
    public String text;

    @SerializedName("quote_id")

    public String quote_id;



    @SerializedName("content_type")

    public String content_type;

    @SerializedName("visibility")

    public String visibility;

    @SerializedName("quote_approval_policy")

    public String quote_approval_policy;

    @SerializedName("language")

    public String language;

    @SerializedName("uri")