From 4240f504cfc84866c6f82a5c9be70a2890dc2edd Mon Sep 17 00:00:00 2001 From: stom79 Date: Sat, 12 May 2018 11:11:17 +0200 Subject: [PATCH] Fixes issue #303 --- .../mastodon/drawers/StatusListAdapter.java | 32 +++++++++++-------- .../mastodon/fragments/SettingsFragment.java | 13 ++++++++ .../gouv/etalab/mastodon/helper/Helper.java | 1 + .../res/layout-sw600dp/fragment_settings.xml | 6 ++++ app/src/main/res/layout/fragment_settings.xml | 8 +++++ app/src/main/res/values/strings.xml | 1 + 6 files changed, 48 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 1f82b5ba7..63e35d1f5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -1438,19 +1438,25 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct else url = status.getUrl(); } - String extra_text = (status.getReblog() != null)?status.getReblog().getAccount().getAcct():status.getAccount().getAcct(); - if( extra_text.split("@").length == 1) - extra_text = "@" + extra_text + "@" + Helper.getLiveInstance(context); - else - extra_text = "@" + extra_text; - extra_text += " " + Helper.shortnameToUnicode(":link:",true) + " " + url + "\r\n-\n"; - final String contentToot; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) - contentToot = Html.fromHtml((status.getReblog() != null)?status.getReblog().getContent():status.getContent(), Html.FROM_HTML_MODE_LEGACY).toString(); - else - //noinspection deprecation - contentToot = Html.fromHtml((status.getReblog() != null)?status.getReblog().getContent():status.getContent()).toString(); - extra_text += contentToot; + String extra_text; + boolean share_details = sharedpreferences.getBoolean(Helper.SET_SHARE_DETAILS, true); + if( share_details) { + extra_text = (status.getReblog() != null) ? status.getReblog().getAccount().getAcct() : status.getAccount().getAcct(); + if (extra_text.split("@").length == 1) + extra_text = "@" + extra_text + "@" + Helper.getLiveInstance(context); + else + extra_text = "@" + extra_text; + extra_text += " " + Helper.shortnameToUnicode(":link:", true) + " " + url + "\r\n-\n"; + final String contentToot; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + contentToot = Html.fromHtml((status.getReblog() != null) ? status.getReblog().getContent() : status.getContent(), Html.FROM_HTML_MODE_LEGACY).toString(); + else + //noinspection deprecation + contentToot = Html.fromHtml((status.getReblog() != null) ? status.getReblog().getContent() : status.getContent()).toString(); + extra_text += contentToot; + }else { + extra_text = url; + } sendIntent.putExtra(Intent.EXTRA_TEXT, extra_text); sendIntent.setType("text/plain"); context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with))); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index 3ad7efb62..084083c03 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -239,6 +239,19 @@ public class SettingsFragment extends Fragment { }); + boolean share_details = sharedpreferences.getBoolean(Helper.SET_SHARE_DETAILS, true); + final CheckBox set_share_details = rootView.findViewById(R.id.set_share_details); + set_share_details.setChecked(share_details); + + set_share_details.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_SHARE_DETAILS, set_share_details.isChecked()); + editor.apply(); + } + }); + boolean multiaccount_actions = sharedpreferences.getBoolean(Helper.SET_ALLOW_CROSS_ACTIONS, true); final CheckBox set_multiaccount_actions = rootView.findViewById(R.id.set_multiaccount_actions); set_multiaccount_actions.setChecked(multiaccount_actions); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index ca0c93862..fac5efd28 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -243,6 +243,7 @@ public class Helper { public static final String SET_SHOW_BOOKMARK = "set_show_bookmark"; public static final String SET_FULL_PREVIEW = "set_full_preview"; public static final String SET_COMPACT_MODE = "set_compact_mode"; + public static final String SET_SHARE_DETAILS = "set_share_details"; public static final int S_512KO = 1; public static final int S_1MO = 2; public static final int S_2MO = 3; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index 9b33d6571..3c663ce25 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -171,6 +171,12 @@ android:text="@string/set_compact_mode" android:layout_height="wrap_content" /> + + + + + + Password Theme: Compact mode + Add toot details when sharing HTTP SOCKS