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

Don't let failed capability retrieval erroneously disable SMS

Browse Source 
Fixes #6135
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-01-31 21:46:20 -08:00
parent bdc8618889
commit 9afbdaa2be
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -55,7 +55,6 @@ import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.View.OnFocusChangeListener; import android.view.View.OnFocusChangeListener;
import android.view.View.OnKeyListener; import android.view.View.OnKeyListener;
import android.view.ViewStub;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageButton; import android.widget.ImageButton;
@ -902,25 +901,24 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
new AsyncTask<Recipients, Void, boolean[]>() { new AsyncTask<Recipients, Void, boolean[]>() {
@Override @Override
protected boolean[] doInBackground(Recipients... params) { protected boolean[] doInBackground(Recipients... params) {
try { Context context = ConversationActivity.this;
Context context = ConversationActivity.this; Recipients recipients = params[0];
Recipients recipients = params[0]; UserCapabilities capabilities = DirectoryHelper.getUserCapabilities(context, recipients);
UserCapabilities capabilities = DirectoryHelper.getUserCapabilities(context, recipients);
if (capabilities.getTextCapability() == Capability.UNKNOWN || if (capabilities.getTextCapability() == Capability.UNKNOWN ||
capabilities.getVoiceCapability() == Capability.UNKNOWN) capabilities.getVoiceCapability() == Capability.UNKNOWN)
{ {
try {
capabilities = DirectoryHelper.refreshDirectoryFor(context, masterSecret, recipients, capabilities = DirectoryHelper.refreshDirectoryFor(context, masterSecret, recipients,
TextSecurePreferences.getLocalNumber(context)); TextSecurePreferences.getLocalNumber(context));
} catch (IOException e) {
Log.w(TAG, e);
} }
return new boolean[] {capabilities.getTextCapability() == Capability.SUPPORTED,
capabilities.getVoiceCapability() == Capability.SUPPORTED && !isSelfConversation(),
Util.isDefaultSmsProvider(context)};
} catch (IOException e) {
Log.w(TAG, e);
return new boolean[]{false, false, false};
} }
return new boolean[] {capabilities.getTextCapability() == Capability.SUPPORTED,
capabilities.getVoiceCapability() == Capability.SUPPORTED && !isSelfConversation(),
Util.isDefaultSmsProvider(context)};
} }
@Override @Override