Merge branch '442-connect-via-tor-not-working' of https://git.secluded.site/cheogram-android

Stephen Paul Weber created 6 months ago

* '442-connect-via-tor-not-working' of https://git.secluded.site/cheogram-android:
  fix(settings): enable Tor conns for other flavs

Change summary

src/main/java/eu/siacs/conversations/AppSettings.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/AppSettings.java

@@ -174,8 +174,7 @@ public class AppSettings {
     }
 
     public boolean isUseTor() {
-        return QuickConversationsService.isConversations()
-                && getBooleanPreference(USE_TOR, R.bool.use_tor);
+        return getBooleanPreference(USE_TOR, R.bool.use_tor);
     }
 
     public boolean isSendChatStates() {
@@ -183,8 +182,7 @@ public class AppSettings {
     }
 
     public boolean isExtendedConnectionOptions() {
-        return QuickConversationsService.isConversations()
-                && getBooleanPreference(
+        return getBooleanPreference(
                         AppSettings.SHOW_CONNECTION_OPTIONS, R.bool.show_connection_options);
     }