Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate user "capability" enums to a single value

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-08-07 14:33:21 -07:00
parent 5a5e47f2df
commit f61c52aace
4 changed files with 22 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,8 +143,7 @@ import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
import org.thoughtcrime.securesms.util.Dialogs;
import org.thoughtcrime.securesms.util.DirectoryHelper;
import org.thoughtcrime.securesms.util.DirectoryHelper.UserCapabilities;
import org.thoughtcrime.securesms.util.DirectoryHelper.UserCapabilities.Capability;
import org.thoughtcrime.securesms.util.DirectoryHelper.Capability;
import org.thoughtcrime.securesms.util.DynamicLanguage;
import org.thoughtcrime.securesms.util.DynamicTheme;
import org.thoughtcrime.securesms.util.ExpirationUtil;
@@ -1016,19 +1015,17 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
protected boolean[] doInBackground(Recipient... params) {
Context context = ConversationActivity.this;
Recipient recipient = params[0];
UserCapabilities capabilities = DirectoryHelper.getUserCapabilities(context, recipient);
Capability capability = DirectoryHelper.getUserCapabilities(context, recipient);
if (capabilities.getTextCapability() == Capability.UNKNOWN ||
capabilities.getVideoCapability() == Capability.UNKNOWN)
{
if (capability == Capability.UNKNOWN) {
try {
capabilities = DirectoryHelper.refreshDirectoryFor(context, masterSecret, recipient);
capability = DirectoryHelper.refreshDirectoryFor(context, masterSecret, recipient);
} catch (IOException e) {
Log.w(TAG, e);
}
}
return new boolean[] {capabilities.getTextCapability() == Capability.SUPPORTED, Util.isDefaultSmsProvider(context)};
return new boolean[] {capability == Capability.SUPPORTED, Util.isDefaultSmsProvider(context)};
}
@Override