TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-03 10:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle contexts more consistently in RecipientPreferences.

Browse Source 
Fixes a crash that was happening on the Pixel 3.
This commit is contained in:
Greyson Parrelli 2018-10-20 22:22:07 -07:00
parent 668e8dee5d
commit 4a0ea0c51c
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,24 +469,27 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
final Context context = preference.getContext();
Uri value = (Uri)newValue; Uri value = (Uri)newValue;
Uri defaultValue; Uri defaultValue;
if (calls) defaultValue = TextSecurePreferences.getCallNotificationRingtone(getContext()); if (calls) defaultValue = TextSecurePreferences.getCallNotificationRingtone(context);
else defaultValue = TextSecurePreferences.getNotificationRingtone(getContext()); else defaultValue = TextSecurePreferences.getNotificationRingtone(context);
if (defaultValue.equals(value)) value = null; if (defaultValue.equals(value)) value = null;
else if (value == null) value = Uri.EMPTY; else if (value == null) value = Uri.EMPTY;
new AsyncTask<Uri, Void, Void>() { new AsyncTask<Uri, Void, Void>() {
@Override @Override
protected Void doInBackground(Uri... params) { protected Void doInBackground(Uri... params) {
if (calls) { if (calls) {
DatabaseFactory.getRecipientDatabase(getActivity()).setCallRingtone(recipient, params[0]); DatabaseFactory.getRecipientDatabase(context).setCallRingtone(recipient, params[0]);
} else { } else {
DatabaseFactory.getRecipientDatabase(getActivity()).setMessageRingtone(recipient, params[0]); DatabaseFactory.getRecipientDatabase(context).setMessageRingtone(recipient, params[0]);
NotificationChannels.updateMessageRingtone(getActivity(), recipient, params[0]); NotificationChannels.updateMessageRingtone(context, recipient, params[0]);
} }
return null; return null;
} }
@ -545,16 +548,17 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
int value = Integer.parseInt((String) newValue); int value = Integer.parseInt((String) newValue);
final VibrateState vibrateState = VibrateState.fromId(value); final VibrateState vibrateState = VibrateState.fromId(value);
final Context context = preference.getContext();
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@Override @Override
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
if (call) { if (call) {
DatabaseFactory.getRecipientDatabase(getActivity()).setCallVibrate(recipient, vibrateState); DatabaseFactory.getRecipientDatabase(context).setCallVibrate(recipient, vibrateState);
} }
else { else {
DatabaseFactory.getRecipientDatabase(getActivity()).setMessageVibrate(recipient, vibrateState); DatabaseFactory.getRecipientDatabase(context).setMessageVibrate(recipient, vibrateState);
NotificationChannels.updateMessageVibrate(getActivity(), recipient, vibrateState); NotificationChannels.updateMessageVibrate(context, recipient, vibrateState);
} }
return null; return null;
} }
@ -597,31 +601,32 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
} }
private class MuteClickedListener implements Preference.OnPreferenceClickListener { private class MuteClickedListener implements Preference.OnPreferenceClickListener {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
if (recipient.isMuted()) handleUnmute(); if (recipient.isMuted()) handleUnmute(preference.getContext());
else handleMute(); else handleMute(preference.getContext());
return true; return true;
} }
private void handleMute() { private void handleMute(@NonNull Context context) {
MuteDialog.show(getActivity(), until -> setMuted(recipient, until)); MuteDialog.show(context, until -> setMuted(context, recipient, until));
setSummaries(recipient); setSummaries(recipient);
} }
private void handleUnmute() { private void handleUnmute(@NonNull Context context) {
setMuted(recipient, 0); setMuted(context, recipient, 0);
} }
private void setMuted(final Recipient recipient, final long until) { private void setMuted(@NonNull final Context context, final Recipient recipient, final long until) {
recipient.setMuted(until); recipient.setMuted(until);
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@Override @Override
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
DatabaseFactory.getRecipientDatabase(getActivity()) DatabaseFactory.getRecipientDatabase(context)
.setMuted(recipient, until); .setMuted(recipient, until);
return null; return null;
} }
@ -640,7 +645,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
Intent verifyIdentityIntent = new Intent(getActivity(), VerifyIdentityActivity.class); Intent verifyIdentityIntent = new Intent(preference.getContext(), VerifyIdentityActivity.class);
verifyIdentityIntent.putExtra(VerifyIdentityActivity.ADDRESS_EXTRA, recipient.getAddress()); verifyIdentityIntent.putExtra(VerifyIdentityActivity.ADDRESS_EXTRA, recipient.getAddress());
verifyIdentityIntent.putExtra(VerifyIdentityActivity.IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey.getIdentityKey())); verifyIdentityIntent.putExtra(VerifyIdentityActivity.IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey.getIdentityKey()));
verifyIdentityIntent.putExtra(VerifyIdentityActivity.VERIFIED_EXTRA, identityKey.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED); verifyIdentityIntent.putExtra(VerifyIdentityActivity.VERIFIED_EXTRA, identityKey.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED);
@ -653,13 +658,13 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
private class BlockClickedListener implements Preference.OnPreferenceClickListener { private class BlockClickedListener implements Preference.OnPreferenceClickListener {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
if (recipient.isBlocked()) handleUnblock(); if (recipient.isBlocked()) handleUnblock(preference.getContext());
else handleBlock(); else handleBlock(preference.getContext());
return true; return true;
} }
private void handleBlock() { private void handleBlock(@NonNull final Context context) {
new AsyncTask<Void, Void, Pair<Integer, Integer>>() { new AsyncTask<Void, Void, Pair<Integer, Integer>>() {
@Override @Override
@ -670,7 +675,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
if (recipient.isGroupRecipient()) { if (recipient.isGroupRecipient()) {
bodyRes = R.string.RecipientPreferenceActivity_block_and_leave_group_description; bodyRes = R.string.RecipientPreferenceActivity_block_and_leave_group_description;
if (recipient.isGroupRecipient() && DatabaseFactory.getGroupDatabase(getContext()).isActive(recipient.getAddress().toGroupString())) { if (recipient.isGroupRecipient() && DatabaseFactory.getGroupDatabase(context).isActive(recipient.getAddress().toGroupString())) {
titleRes = R.string.RecipientPreferenceActivity_block_and_leave_group; titleRes = R.string.RecipientPreferenceActivity_block_and_leave_group;
} else { } else {
titleRes = R.string.RecipientPreferenceActivity_block_group; titleRes = R.string.RecipientPreferenceActivity_block_group;
@ -682,19 +687,19 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
@Override @Override
protected void onPostExecute(Pair<Integer, Integer> titleAndBody) { protected void onPostExecute(Pair<Integer, Integer> titleAndBody) {
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(context)
.setTitle(titleAndBody.first) .setTitle(titleAndBody.first)
.setMessage(titleAndBody.second) .setMessage(titleAndBody.second)
.setCancelable(true) .setCancelable(true)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.RecipientPreferenceActivity_block, (dialog, which) -> { .setPositiveButton(R.string.RecipientPreferenceActivity_block, (dialog, which) -> {
setBlocked(recipient, true); setBlocked(context, recipient, true);
}).show(); }).show();
} }
}.execute(); }.execute();
} }
private void handleUnblock() { private void handleUnblock(@NonNull Context context) {
int titleRes = R.string.RecipientPreferenceActivity_unblock_this_contact_question; int titleRes = R.string.RecipientPreferenceActivity_unblock_this_contact_question;
int bodyRes = R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact; int bodyRes = R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact;
@ -703,20 +708,18 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
bodyRes = R.string.RecipientPreferenceActivity_unblock_this_group_description; bodyRes = R.string.RecipientPreferenceActivity_unblock_this_group_description;
} }
new AlertDialog.Builder(getActivity()) new AlertDialog.Builder(context)
.setTitle(titleRes) .setTitle(titleRes)
.setMessage(bodyRes) .setMessage(bodyRes)
.setCancelable(true) .setCancelable(true)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, (dialog, which) -> setBlocked(recipient, false)).show(); .setPositiveButton(R.string.RecipientPreferenceActivity_unblock, (dialog, which) -> setBlocked(context, recipient, false)).show();
} }
private void setBlocked(final Recipient recipient, final boolean blocked) { private void setBlocked(@NonNull final Context context, final Recipient recipient, final boolean blocked) {
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@Override @Override
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
Context context = getActivity();
DatabaseFactory.getRecipientDatabase(context) DatabaseFactory.getRecipientDatabase(context)
.setBlocked(recipient, blocked); .setBlocked(recipient, blocked);
@ -777,17 +780,18 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
final Context context = preference.getContext();
final boolean enabled = (boolean) newValue; final boolean enabled = (boolean) newValue;
new AsyncTask<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
@Override @Override
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
if (enabled) { if (enabled) {
String channel = NotificationChannels.createChannelFor(getActivity(), recipient); String channel = NotificationChannels.createChannelFor(context, recipient);
DatabaseFactory.getRecipientDatabase(getActivity()).setNotificationChannel(recipient, channel); DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient, channel);
} else { } else {
NotificationChannels.deleteChannelFor(getActivity(), recipient); NotificationChannels.deleteChannelFor(context, recipient);
DatabaseFactory.getRecipientDatabase(getActivity()).setNotificationChannel(recipient, null); DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient, null);
} }
return null; return null;
} }