diff --git a/CHANGELOG.md b/CHANGELOG.md index 21e37845a..f9627a1f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * Better incoming call system integration * Calls are not experimental anymore and don't need to be manually enabled +* Channels are no longer experimental and are available by default * Display a permanent notification when doing location streaming and get rid of dangerous "Access Location in Background" permission * Autoplay all voice messages in a chat * Allow to share location for 24 hours diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java b/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java index 93e72f4b1..62d6c1392 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcContactsLoader.java @@ -5,7 +5,6 @@ import androidx.annotation.NonNull; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; import org.thoughtcrime.securesms.util.AsyncLoader; -import org.thoughtcrime.securesms.util.Prefs; import org.thoughtcrime.securesms.util.Util; public class DcContactsLoader extends AsyncLoader { @@ -53,10 +52,7 @@ public class DcContactsLoader extends AsyncLoader { } if (query == null && addCreateGroupLinks) { additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_GROUP); - - final boolean broadcastsEnabled = Prefs.isNewBroadcastAvailable(getContext()); - if (broadcastsEnabled) - additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_BROADCAST); + additional_items = Util.appendInt(additional_items, DcContact.DC_CONTACT_ID_NEW_BROADCAST); if (!dcContext.isChatmail()) { additional_items = diff --git a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 60d6baf07..4caf4ffd7 100644 --- a/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -151,24 +151,6 @@ public class AdvancedPreferenceFragment extends ListSummaryPreferenceFragment } updateWebxdcStoreSummary(); - Preference newBroadcastList = this.findPreference("pref_new_broadcast_list"); - if (newBroadcastList != null) { - newBroadcastList.setOnPreferenceChangeListener( - (preference, newValue) -> { - if ((Boolean) newValue) { - new AlertDialog.Builder(requireActivity()) - .setTitle("Thanks for trying out \"Channels\"!") - .setMessage( - "• You can now create new \"Channels\" from the \"New Chat\" dialog\n\n" - + "• If you want to quit the experimental feature, you can disable it at \"Settings / Advanced\"") - .setCancelable(false) - .setPositiveButton(R.string.ok, null) - .show(); - } - return true; - }); - } - Preference locationStreamingEnabled = this.findPreference("pref_location_streaming_enabled"); if (locationStreamingEnabled != null) { locationStreamingEnabled.setOnPreferenceChangeListener( diff --git a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java index 3e58b60b7..a1c3dd5fd 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/Prefs.java +++ b/src/main/java/org/thoughtcrime/securesms/util/Prefs.java @@ -198,10 +198,6 @@ public class Prefs { } } - public static boolean isNewBroadcastAvailable(Context context) { - return getBooleanPreference(context, "pref_new_broadcast_list", false); - } - // ringtone public static @NonNull Uri getNotificationRingtone(Context context) { diff --git a/src/main/res/xml/preferences_advanced.xml b/src/main/res/xml/preferences_advanced.xml index a3fc3d617..8eb7f18be 100644 --- a/src/main/res/xml/preferences_advanced.xml +++ b/src/main/res/xml/preferences_advanced.xml @@ -30,11 +30,6 @@ android:summary="@string/pref_experimental_features_explain" android:selectable="false" /> - -