awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

remove unnecessary getConnectivitySummary(context, int)

Browse Source
This commit is contained in:
adbenitez
2024-10-04 16:44:38 +02:00
parent 3431163c24
commit 776dc05755
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+2 -2
View File
@@ -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()));
}
src/main/java/org/thoughtcrime/securesms/ConversationListActivity.java
+3 -7
View File
@@ -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);
}
}
src/main/java/org/thoughtcrime/securesms/connect/DcHelper.java
-4
View File
@@ -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))