TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE in isPushDestination

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty 2014-03-24 17:02:39 -07:00
parent ccc1f5e9d6
commit e651f352bb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/util/DirectoryHelper.java
View File

@ -46,11 +46,13 @@ public class DirectoryHelper {
public static boolean isPushDestination(Context context, Recipient recipient) { public static boolean isPushDestination(Context context, Recipient recipient) {
try { try {
if (!TextSecurePreferences.isPushRegistered(context)) return false; final String number = recipient.getNumber();
if (GroupUtil.isEncodedGroup(recipient.getNumber())) return true;
String number = recipient.getNumber(); if (number == null) return false;
String e164number = Util.canonicalizeNumber(context, number); if (!TextSecurePreferences.isPushRegistered(context)) return false;
if (GroupUtil.isEncodedGroup(number)) return true;
final String e164number = Util.canonicalizeNumber(context, number);
return Directory.getInstance(context).isActiveNumber(e164number); return Directory.getInstance(context).isActiveNumber(e164number);
} catch (InvalidNumberException e) { } catch (InvalidNumberException e) {