TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 09:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display carrier or number if any SIM descriptions clash.

Browse Source 
Fixes #8725
This commit is contained in:
Alan Evans 2019-04-19 14:14:53 -03:00 committed by Greyson Parrelli
parent fa35814344
commit c77daa8226
3 changed files with 78 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/TransportOptions.java
View File

@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat; import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -155,14 +157,14 @@ public class TransportOptions {
@NonNull String composeHint, @NonNull String composeHint,
@NonNull CharacterCalculator characterCalculator) @NonNull CharacterCalculator characterCalculator)
{ {
List<TransportOption> results = new LinkedList<>(); List<TransportOption> results = new LinkedList<>();
SubscriptionManagerCompat subscriptionManager = new SubscriptionManagerCompat(context); SubscriptionManagerCompat subscriptionManager = new SubscriptionManagerCompat(context);
List<SubscriptionInfoCompat> subscriptions; Collection<SubscriptionInfoCompat> subscriptions;
if (Permissions.hasAll(context, Manifest.permission.READ_PHONE_STATE)) { if (Permissions.hasAll(context, Manifest.permission.READ_PHONE_STATE)) {
subscriptions = subscriptionManager.getActiveSubscriptionInfoList(); subscriptions = subscriptionManager.getActiveAndReadySubscriptionInfos();
} else { } else {
subscriptions = new LinkedList<>(); subscriptions = Collections.emptyList();
} }
if (subscriptions.size() < 2) { if (subscriptions.size() < 2) {

2
src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
View File

@ -106,7 +106,7 @@ public class ConversationItemFooter extends LinearLayout {
private void presentSimInfo(@NonNull MessageRecord messageRecord) { private void presentSimInfo(@NonNull MessageRecord messageRecord) {
SubscriptionManagerCompat subscriptionManager = new SubscriptionManagerCompat(getContext()); SubscriptionManagerCompat subscriptionManager = new SubscriptionManagerCompat(getContext());
if (messageRecord.isPush() || messageRecord.getSubscriptionId() == -1 || !Permissions.hasAll(getContext(), Manifest.permission.READ_PHONE_STATE) || subscriptionManager.getActiveSubscriptionInfoList().size() < 2) { if (messageRecord.isPush() || messageRecord.getSubscriptionId() == -1 || !Permissions.hasAll(getContext(), Manifest.permission.READ_PHONE_STATE) || subscriptionManager.getActiveAndReadySubscriptionInfos().size() < 2) {
simView.setVisibility(View.GONE); simView.setVisibility(View.GONE);
} else { } else {
Optional<SubscriptionInfoCompat> subscriptionInfo = subscriptionManager.getActiveSubscriptionInfo(messageRecord.getSubscriptionId()); Optional<SubscriptionInfoCompat> subscriptionInfo = subscriptionManager.getActiveSubscriptionInfo(messageRecord.getSubscriptionId());

94
src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
View File

@ -9,10 +9,19 @@ import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.ServiceUtil;
import org.whispersystems.libsignal.util.guava.Function;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import org.whispersystems.signalservice.api.util.PhoneNumberFormatter;
import java.util.LinkedList; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
public final class SubscriptionManagerCompat { public final class SubscriptionManagerCompat {
@ -35,48 +44,85 @@ public final class SubscriptionManagerCompat {
return Optional.absent(); return Optional.absent();
} }
SubscriptionInfo subscriptionInfo = getSubscriptionManager().getActiveSubscriptionInfo(subscriptionId); return Optional.fromNullable(getActiveSubscriptionInfoMap(false).get(subscriptionId));
if (subscriptionInfo != null) {
return Optional.of(new SubscriptionInfoCompat(subscriptionId, subscriptionInfo.getDisplayName(),
subscriptionInfo.getMcc(), subscriptionInfo.getMnc()));
} else {
return Optional.absent();
}
} }
public @NonNull List<SubscriptionInfoCompat> getActiveSubscriptionInfoList() { public @NonNull Collection<SubscriptionInfoCompat> getActiveAndReadySubscriptionInfos() {
if (Build.VERSION.SDK_INT < 22) { if (Build.VERSION.SDK_INT < 22) {
return new LinkedList<>(); return Collections.emptyList();
} }
List<SubscriptionInfo> subscriptionInfos = getSubscriptionManager().getActiveSubscriptionInfoList(); return getActiveSubscriptionInfoMap(true).values();
}
@RequiresApi(api = 22)
private @NonNull Map<Integer, SubscriptionInfoCompat> getActiveSubscriptionInfoMap(boolean excludeUnreadySubscriptions) {
List<SubscriptionInfo> subscriptionInfos = ServiceUtil.getSubscriptionManager(context).getActiveSubscriptionInfoList();
if (subscriptionInfos == null || subscriptionInfos.isEmpty()) { if (subscriptionInfos == null || subscriptionInfos.isEmpty()) {
return new LinkedList<>(); return Collections.emptyMap();
} }
List<SubscriptionInfoCompat> compatList = new LinkedList<>(); Map<SubscriptionInfo, CharSequence> descriptions = getDescriptionsFor(subscriptionInfos);
Map<Integer, SubscriptionInfoCompat> map = new LinkedHashMap<>();
for (SubscriptionInfo subscriptionInfo : subscriptionInfos) { for (SubscriptionInfo subscriptionInfo : subscriptionInfos) {
if (isReady(subscriptionInfo)) { if (!excludeUnreadySubscriptions || isReady(subscriptionInfo)) {
compatList.add(new SubscriptionInfoCompat(subscriptionInfo.getSubscriptionId(), map.put(subscriptionInfo.getSubscriptionId(),
subscriptionInfo.getDisplayName(), new SubscriptionInfoCompat(subscriptionInfo.getSubscriptionId(),
subscriptionInfo.getMcc(), descriptions.get(subscriptionInfo),
subscriptionInfo.getMnc())); subscriptionInfo.getMcc(),
subscriptionInfo.getMnc()));
} }
} }
return compatList; return map;
} }
@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP_MR1) @RequiresApi(api = 22)
private SubscriptionManager getSubscriptionManager() { private static Map<SubscriptionInfo, CharSequence> getDescriptionsFor(@NonNull Collection<SubscriptionInfo> subscriptions) {
return ServiceUtil.getSubscriptionManager(context); Map<SubscriptionInfo, CharSequence> descriptions;
descriptions = createDescriptionMap(subscriptions, SubscriptionInfo::getDisplayName);
if (hasNoDuplicates(descriptions.values())) return descriptions;
descriptions = createDescriptionMap(subscriptions, SubscriptionInfo::getCarrierName);
if (hasNoDuplicates(descriptions.values())) return descriptions;
return createDescriptionMap(subscriptions, (subscriptionInfo) -> formatNumber(subscriptionInfo.getNumber()));
}
private static Map<SubscriptionInfo, CharSequence> createDescriptionMap(@NonNull Collection<SubscriptionInfo> subscriptions,
@NonNull Function<SubscriptionInfo, CharSequence> createDescription)
{
Map<SubscriptionInfo, CharSequence> descriptions = new HashMap<>();
for (SubscriptionInfo subscriptionInfo: subscriptions) {
descriptions.put(subscriptionInfo, createDescription.apply(subscriptionInfo));
}
return descriptions;
}
private static <T> boolean hasNoDuplicates(Collection<T> collection) {
final Set<T> set = new HashSet<>();
for (T t : collection) {
if (!set.add(t)) {
return false;
}
}
return true;
}
private static String formatNumber(String number) {
try {
return PhoneNumberFormatter.formatNumber(number, number);
} catch (InvalidNumberException e) {
return number;
}
} }
private boolean isReady(@NonNull SubscriptionInfo subscriptionInfo) { private boolean isReady(@NonNull SubscriptionInfo subscriptionInfo) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return true; if (Build.VERSION.SDK_INT < 24) return true;
TelephonyManager telephonyManager = ServiceUtil.getTelephonyManager(context); TelephonyManager telephonyManager = ServiceUtil.getTelephonyManager(context);