From ac1f2ebdd96f93c6ec1ff9a1f0c7c1becfb22ef4 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Thu, 5 Oct 2023 22:02:09 +0200 Subject: [PATCH] rename blocked-contacts-activity `BlockedAndShareContactsActivity` is no longer used for sharing contacts, this was always a misleading name and is done since #2719 by `AttachContactActivity`. --- AndroidManifest.xml | 2 +- ...reContactsActivity.java => BlockedContactsActivity.java} | 6 ++---- .../securesms/preferences/ChatsPreferenceFragment.java | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) rename src/org/thoughtcrime/securesms/{BlockedAndShareContactsActivity.java => BlockedContactsActivity.java} (97%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3fa828bd5..1e8485980 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -277,7 +277,7 @@ android:theme="@style/TextSecure.LightTheme" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> - diff --git a/src/org/thoughtcrime/securesms/BlockedAndShareContactsActivity.java b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java similarity index 97% rename from src/org/thoughtcrime/securesms/BlockedAndShareContactsActivity.java rename to src/org/thoughtcrime/securesms/BlockedContactsActivity.java index cf2e72569..261cc22c8 100644 --- a/src/org/thoughtcrime/securesms/BlockedAndShareContactsActivity.java +++ b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java @@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.contacts.ContactSelectionListItem; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.util.ViewUtil; -public class BlockedAndShareContactsActivity extends PassphraseRequiredActionBarActivity { +public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity { @Override public void onCreate(Bundle bundle, boolean ready) { @@ -136,9 +136,7 @@ public class BlockedAndShareContactsActivity extends PassphraseRequiredActionBar } @Override - public void onItemLongClick(ContactSelectionListItem view) { - // Not needed - } + public void onItemLongClick(ContactSelectionListItem view) {} } } diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index 85e3f5d6c..967b937a2 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -21,7 +21,7 @@ import androidx.preference.Preference; import com.b44t.messenger.DcContext; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; -import org.thoughtcrime.securesms.BlockedAndShareContactsActivity; +import org.thoughtcrime.securesms.BlockedContactsActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.permissions.Permissions; @@ -185,7 +185,7 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment { private class BlockedContactsClickListener implements Preference.OnPreferenceClickListener { @Override public boolean onPreferenceClick(Preference preference) { - Intent intent = new Intent(getActivity(), BlockedAndShareContactsActivity.class); + Intent intent = new Intent(getActivity(), BlockedContactsActivity.class); startActivity(intent); return true; }