From 776dc05755ed362de324bbd7390186cb8ef679f6 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 4 Oct 2024 16:44:38 +0200 Subject: [PATCH] remove unnecessary getConnectivitySummary(context, int) --- .../securesms/ApplicationPreferencesActivity.java | 4 ++-- .../securesms/ConversationListActivity.java | 10 +++------- .../org/thoughtcrime/securesms/connect/DcHelper.java | 4 ---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index 6812b87b2..e1993d98b 100644 --- a/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -182,7 +182,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA public void handleEvent(@NonNull DcEvent event) { if (event.getId() == DcContext.DC_EVENT_CONNECTIVITY_CHANGED) { this.findPreference(PREFERENCE_CATEGORY_CONNECTIVITY) - .setSummary(DcHelper.getConnectivitySummary(getActivity(), R.string.connectivity_connected)); + .setSummary(DcHelper.getConnectivitySummary(getActivity(), getString(R.string.connectivity_connected))); } } @@ -196,7 +196,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA this.findPreference(PREFERENCE_CATEGORY_CHATS) .setSummary(ChatsPreferenceFragment.getSummary(getActivity())); this.findPreference(PREFERENCE_CATEGORY_CONNECTIVITY) - .setSummary(DcHelper.getConnectivitySummary(getActivity(), R.string.connectivity_connected)); + .setSummary(DcHelper.getConnectivitySummary(getActivity(), getString(R.string.connectivity_connected))); this.findPreference(PREFERENCE_CATEGORY_HELP) .setSummary(AdvancedPreferenceFragment.getVersion(getActivity())); } diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java index 3b2c2c90a..13b3fc407 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java @@ -298,13 +298,9 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit } getSupportActionBar().setDisplayHomeAsUpEnabled(true); } else { - String titleText; - if (DcHelper.getAccounts(this).getAll().length > 1) { - titleText = DcHelper.getConnectivitySummary(this, DcHelper.getContext(this).getName()); - } else { - titleText = DcHelper.getConnectivitySummary(this, R.string.app_name); - } - title.setText(titleText); + boolean multiProfile = DcHelper.getAccounts(this).getAll().length > 1; + String defText = multiProfile? DcHelper.getContext(this).getName() : getString(R.string.app_name); + title.setText(DcHelper.getConnectivitySummary(this, defText)); getSupportActionBar().setDisplayHomeAsUpEnabled(false); } } diff --git a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java index 19ce32de6..a2b03f8ec 100644 --- a/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java +++ b/src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java @@ -452,10 +452,6 @@ public class DcHelper { } } - public static String getConnectivitySummary(Context context, int connectedString) { - return getConnectivitySummary(context, context.getString(connectedString)); - } - public static void showVerificationBrokenDialog(Context context, String name) { new AlertDialog.Builder(context) .setMessage(context.getString(R.string.chat_protection_broken_explanation, name))