From b7e9380bc4622ef3d970ab242aef04bdad914b21 Mon Sep 17 00:00:00 2001 From: sk Date: Sun, 28 May 2023 14:55:53 +0200 Subject: [PATCH] enable unspecified as default formatting option closes sk22#521 --- .../org/joinmastodon/android/fragments/ComposeFragment.java | 4 ---- .../org/joinmastodon/android/fragments/SettingsFragment.java | 2 -- 2 files changed, 6 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 57b91fba6..445e573c6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -245,10 +245,6 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr accountID=getArguments().getString("account"); contentType = GlobalUserPreferences.accountsDefaultContentTypes.get(accountID); - if (contentType == null && GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID)) { - // if formatting is enabled, use plain to avoid confusing unspecified default setting - contentType = ContentType.PLAIN; - } AccountSession session=AccountSessionManager.getInstance().getAccount(accountID); self=session.self; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index 2b25ba8eb..052561cff 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -362,8 +362,6 @@ public class SettingsFragment extends MastodonToolbarFragment{ contentTypeMenu = popupMenu.getMenu(); contentTypeMenu.findItem(ContentType.getContentTypeRes(contentType)).setChecked(true); ContentType.adaptMenuToInstance(contentTypeMenu, instance); - contentTypeMenu.findItem(R.id.content_type_null).setVisible( - !GlobalUserPreferences.accountsWithContentTypesEnabled.contains(accountID)); })); items.add(new SmallTextItem(getString(R.string.sk_settings_default_content_type_explanation))); items.add(new SwitchItem(R.string.sk_settings_support_local_only, 0, GlobalUserPreferences.accountsWithLocalOnlySupport.contains(accountID), i->{