mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix blocked refresh and format argument.

main
Alex Hart 2022-11-02 15:03:21 -03:00 zatwierdzone przez Cody Henthorne
rodzic ffeb60fcdd
commit 5da7052da3
1 zmienionych plików z 5 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
Wyświetl plik

@ -342,7 +342,8 @@ public class NewConversationActivity extends ContactSelectionActivity
recipient, recipient,
() -> { () -> {
disposables.add(viewModel.blockContact(recipient).subscribe(() -> { disposables.add(viewModel.blockContact(recipient).subscribe(() -> {
displaySnackbar(R.string.NewConversationActivity__s_has_been_removed); displaySnackbar(R.string.NewConversationActivity__s_has_been_blocked, recipient.getDisplayName(this));
contactsFragment.reset();
})); }));
}) })
); );
@ -366,7 +367,7 @@ public class NewConversationActivity extends ContactSelectionActivity
.setPositiveButton(R.string.NewConversationActivity__remove, .setPositiveButton(R.string.NewConversationActivity__remove,
(dialog, which) -> { (dialog, which) -> {
disposables.add(viewModel.hideContact(recipient).subscribe(() -> { disposables.add(viewModel.hideContact(recipient).subscribe(() -> {
displaySnackbar(R.string.NewConversationActivity__s_has_been_removed); displaySnackbar(R.string.NewConversationActivity__s_has_been_removed, recipient.getDisplayName(this));
})); }));
} }
) )
@ -374,7 +375,7 @@ public class NewConversationActivity extends ContactSelectionActivity
.show(); .show();
} }
private void displaySnackbar(@StringRes int message) { private void displaySnackbar(@StringRes int message, Object ... formatArgs) {
Snackbar.make(findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT).show(); Snackbar.make(findViewById(android.R.id.content), getString(message, formatArgs), Snackbar.LENGTH_SHORT).show();
} }
} }