pending messages more accurately conveyed to user

This commit is contained in:
Jake McGinty
2014-02-26 00:30:29 -08:00
parent 0f53c9d170
commit 90169e9468
18 changed files with 234 additions and 21 deletions

View File

@@ -1,18 +1,23 @@
package org.thoughtcrime.securesms.util;
import android.content.Context;
import android.util.Log;
import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.whispersystems.textsecure.directory.Directory;
import org.whispersystems.textsecure.directory.NotInDirectoryException;
import org.whispersystems.textsecure.push.ContactTokenDetails;
import org.whispersystems.textsecure.push.PushServiceSocket;
import org.whispersystems.textsecure.util.DirectoryUtil;
import org.whispersystems.textsecure.util.InvalidNumberException;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class DirectoryHelper {
private static final String TAG = DirectoryHelper.class.getSimpleName();
public static void refreshDirectory(final Context context) {
refreshDirectory(context, PushServiceSocketFactory.create(context));
@@ -38,4 +43,21 @@ public class DirectoryHelper {
directory.setNumbers(activeTokens, eligibleContactNumbers);
}
}
public static boolean isPushDestination(Context context, Recipient recipient) {
try {
if (!TextSecurePreferences.isPushRegistered(context)) return false;
if (GroupUtil.isEncodedGroup(recipient.getNumber())) return true;
String number = recipient.getNumber();
String e164number = Util.canonicalizeNumber(context, number);
return Directory.getInstance(context).isActiveNumber(e164number);
} catch (InvalidNumberException e) {
Log.w(TAG, e);
return false;
} catch (NotInDirectoryException e) {
return false;
}
}
}