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

Update to RingRTC v2.28.0

Browse Source 
Co-authored-by: Jordan Rose <jrose@signal.org>
This commit is contained in:
Jim Gustafson
2023-06-01 07:25:54 -07:00
committed by Cody Henthorne
parent cd9a160cae
commit c08e108fc3
23 changed files with 67 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/util/NetworkUtil.java
View File

@@ -33,16 +33,16 @@ public final class NetworkUtil {
return info != null && info.isConnected() && info.isRoaming() && info.getType() == ConnectivityManager.TYPE_MOBILE;
}
public static @NonNull CallManager.BandwidthMode getCallingBandwidthMode(@NonNull Context context) {
return getCallingBandwidthMode(context, PeerConnection.AdapterType.UNKNOWN);
public static @NonNull CallManager.DataMode getCallingDataMode(@NonNull Context context) {
return getCallingDataMode(context, PeerConnection.AdapterType.UNKNOWN);
}
public static @NonNull CallManager.BandwidthMode getCallingBandwidthMode(@NonNull Context context, @NonNull PeerConnection.AdapterType networkAdapter) {
if (SignalStore.internalValues().callingBandwidthMode() != CallManager.BandwidthMode.NORMAL) {
return SignalStore.internalValues().callingBandwidthMode();
public static @NonNull CallManager.DataMode getCallingDataMode(@NonNull Context context, @NonNull PeerConnection.AdapterType networkAdapter) {
if (SignalStore.internalValues().callingDataMode() != CallManager.DataMode.NORMAL) {
return SignalStore.internalValues().callingDataMode();
}
return useLowBandwidthCalling(context, networkAdapter) ? CallManager.BandwidthMode.LOW : CallManager.BandwidthMode.NORMAL;
return useLowDataCalling(context, networkAdapter) ? CallManager.DataMode.LOW : CallManager.DataMode.NORMAL;
}
public static String getNetworkTypeDescriptor(@NonNull Context context) {
@@ -97,8 +97,8 @@ public final class NetworkUtil {
}
}
private static boolean useLowBandwidthCalling(@NonNull Context context, @NonNull PeerConnection.AdapterType networkAdapter) {
switch (SignalStore.settings().getCallBandwidthMode()) {
private static boolean useLowDataCalling(@NonNull Context context, @NonNull PeerConnection.AdapterType networkAdapter) {
switch (SignalStore.settings().getCallDataMode()) {
case HIGH_ON_WIFI:
switch (networkAdapter) {
case UNKNOWN:

2
app/src/main/java/org/thoughtcrime/securesms/util/TextSecurePreferences.java
View File

@@ -106,8 +106,6 @@ public class TextSecurePreferences {
public static final String MEDIA_DOWNLOAD_WIFI_PREF = "pref_media_download_wifi";
public static final String MEDIA_DOWNLOAD_ROAMING_PREF = "pref_media_download_roaming";
public static final String CALL_BANDWIDTH_PREF = "pref_data_call_bandwidth";
public static final String SYSTEM_EMOJI_PREF = "pref_system_emoji";
private static final String MULTI_DEVICE_PROVISIONED_PREF = "pref_multi_device";
public static final String DIRECT_CAPTURE_CAMERA_ID = "pref_direct_capture_camera_id";