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

Clean up several UX interactions with proxy entry.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-02-03 13:45:40 -05:00
parent e798f3f276
commit 64fe78ff9a
8 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
View File

@@ -243,7 +243,9 @@ public class SignalServiceNetworkAccess {
}
public SignalServiceConfiguration getConfiguration(@Nullable String localNumber) {
if (localNumber == null) return this.uncensoredConfiguration;
if (localNumber == null || SignalStore.proxy().isProxyEnabled()) {
return this.uncensoredConfiguration;
}
if (SignalStore.internalValues().forcedCensorship()) {
return this.censorshipConfiguration.get(COUNTRY_CODE_QATAR);