Commit fa989a40 authored by Thomas's avatar Thomas
Browse files

Fix issue #115 - Allow to set replies in "unlisted" (enabled by default)

parent 59a8b5da

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

+6 −0
Original line number Diff line number Diff line
@@ -628,6 +628,7 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
                statusDraftList.get(0).mentions.add(mention);

            }





            //There are other mentions to

            if (statusReply.mentions != null && statusReply.mentions.size() > 0) {

                for (Mention mentionTmp : statusReply.mentions) {
@@ -732,6 +733,11 @@ public class ComposeActivity extends BaseActivity implements ComposeAdapter.Mana 
        status.id = Helper.generateIdString();

        status.mentions = statusList.get(position).mentions;

        status.visibility = statusList.get(position).visibility;

        final SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ComposeActivity.this);

        boolean unlistedReplies = sharedpreferences.getBoolean(getString(R.string.SET_UNLISTED_REPLIES), true);

        if (status.visibility.equalsIgnoreCase("public") && unlistedReplies) {

            status.visibility = "unlisted";

        }

        status.spoiler_text = statusList.get(position).spoiler_text;

        status.sensitive = statusList.get(position).sensitive;

        statusList.add(status);

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

+4 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,10 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                } else {

                    statusDraft.visibility = "public";

                }

                boolean unlistedReplies = sharedpreferences.getBoolean(context.getString(R.string.SET_UNLISTED_REPLIES), true);

                if (position == 0 && unlistedReplies && statusDraft.visibility.equalsIgnoreCase("public") && statusList.size() > 1) {

                    statusDraft.visibility = "unlisted";

                }

            }



            switch (statusDraft.visibility.toLowerCase()) {

app/src/main/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -997,6 +997,8 @@ 
    <string name="SET_ART_WITH_NSFW" translatable="false">SET_ART_WITH_NSFW</string>

    <string name="SET_VIDEO_CACHE" translatable="false">SET_VIDEO_CACHE</string>

    <string name="SET_WATERMARK" translatable="false">SET_WATERMARK</string>

    <string name="SET_UNLISTED_REPLIES" translatable="false">SET_UNLISTED_REPLIES</string>



    <string name="SET_WATERMARK_TEXT" translatable="false">SET_WATERMARK_TEXT</string>

    <string name="SET_PROXY_PASSWORD" translatable="false">SET_PROXY_PASSWORD</string>

    <string name="SET_PROXY_LOGIN" translatable="false">SET_PROXY_LOGIN</string>
@@ -1563,4 +1565,6 @@ 
    <string name="edited_message_at">Edited at %1$s</string>

    <string name="created_message_at">Created at %1$s</string>

    <string name="max_indentation_thread">Max indentation in threads</string>

    <string name="set_unlisted_replies">Unlisted replies</string>

    <string name="set_unlisted_replies_indication">It only concerns \"public\" replies. When enabled, your replies will automatically have the visibility \"unlisted\" instead of \"public\"</string>

</resources>

app/src/main/res/xml/pref_compose.xml

+8 −0
Original line number Diff line number Diff line
@@ -30,6 +30,14 @@ 
        app:summary="@string/set_resize_video_indication"

        app:title="@string/set_resize_video" />

    -->

    <SwitchPreferenceCompat

        app:defaultValue="true"

        app:iconSpaceReserved="false"

        app:key="@string/SET_UNLISTED_REPLIES"

        app:singleLineTitle="false"

        app:summary="@string/set_unlisted_replies_indication"

        app:title="@string/set_unlisted_replies" />



    <SwitchPreferenceCompat

        app:defaultValue="false"

        app:iconSpaceReserved="false"