TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change text of dialog box confirming blocking.

Browse Source 
Blocking users now also blocks incoming calls, so the block confirmation
message has been updated.

fixes #4217
Closes #4295

// FREEBIE
This commit is contained in:
Sam Lanning 2015-10-24 12:36:36 +01:00 committed by Moxie Marlinspike
parent 34b80f91ee
commit c342f0d7e4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@ -337,7 +337,7 @@
<!-- RecipientPreferencesActivity --> <!-- RecipientPreferencesActivity -->
<string name="RecipientPreferenceActivity_block_this_contact_question">Block this contact?</string> <string name="RecipientPreferenceActivity_block_this_contact_question">Block this contact?</string>
<string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">You will no longer see messages sent from this user.</string> <string name="RecipientPreferenceActivity_you_will_no_longer_receive_calls_or_messages_from_this_user">You will no longer receive calls or messages from this user.</string>
<string name="RecipientPreferenceActivity_block">Block</string> <string name="RecipientPreferenceActivity_block">Block</string>
<string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string> <string name="RecipientPreferenceActivity_unblock_this_contact_question">Unblock this contact?</string>
<string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Are you sure you want to unblock this contact?</string> <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Are you sure you want to unblock this contact?</string>

2
src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
View File

@ -382,7 +382,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
private void handleBlock() { private void handleBlock() {
new AlertDialogWrapper.Builder(getActivity()) new AlertDialogWrapper.Builder(getActivity())
.setTitle(R.string.RecipientPreferenceActivity_block_this_contact_question) .setTitle(R.string.RecipientPreferenceActivity_block_this_contact_question)
.setMessage(R.string.RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user) .setMessage(R.string.RecipientPreferenceActivity_you_will_no_longer_receive_calls_or_messages_from_this_user)
.setCancelable(true) .setCancelable(true)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.RecipientPreferenceActivity_block, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.RecipientPreferenceActivity_block, new DialogInterface.OnClickListener() {