From db697e8b68d293723e3015025ba0ca655e59f97d Mon Sep 17 00:00:00 2001
From: Daniel Lublin <daniel@lublin.se>
Date: Fri, 10 Apr 2020 14:11:48 +0200
Subject: Display Tor note conditionally (lost in a refactor)

---
 app/src/main/java/se/lublin/mumla/app/MumlaActivity.java    |  4 ++--
 app/src/main/java/se/lublin/mumla/service/MumlaService.java | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
index 7761e15..a3a85ca 100644
--- a/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
+++ b/app/src/main/java/se/lublin/mumla/app/MumlaActivity.java
@@ -698,7 +698,7 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
                     }
                 });
                 mConnectingDialog.setMessage(getString(R.string.connecting_to_server,
-                        server.getHost(), server.getPort()) + " (Tor)");
+                        server.getHost(), server.getPort()) + (mSettings.isTorEnabled() ? " (Tor)" : ""));
                 mConnectingDialog.show();
                 break;
             case CONNECTION_LOST:
@@ -706,7 +706,7 @@ public class MumlaActivity extends AppCompatActivity implements ListView.OnItemC
                 if (!getService().isErrorShown()) {
                     HumlaException error = getService().getConnectionError();
                     AlertDialog.Builder ab = new AlertDialog.Builder(MumlaActivity.this);
-                    ab.setTitle(getString(R.string.connectionRefused) + " (Tor)");
+                    ab.setTitle(getString(R.string.connectionRefused) + (mSettings.isTorEnabled() ? " (Tor)" : ""));
                     if (mService.isReconnecting()) {
                         ab.setMessage(getString(R.string.attempting_reconnect, error.getMessage()));
                         ab.setPositiveButton(R.string.cancel_reconnect, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/se/lublin/mumla/service/MumlaService.java b/app/src/main/java/se/lublin/mumla/service/MumlaService.java
index 6638873..c64b3e7 100644
--- a/app/src/main/java/se/lublin/mumla/service/MumlaService.java
+++ b/app/src/main/java/se/lublin/mumla/service/MumlaService.java
@@ -125,7 +125,7 @@ public class MumlaService extends HumlaService implements
 
             mNotification = MumlaConnectionNotification.create(MumlaService.this,
                     getString(R.string.mumlaConnecting),
-                    getString(R.string.connecting) + " (Tor)",
+                    getString(R.string.connecting) + (mSettings.isTorEnabled() ? " (Tor)" : ""),
                     MumlaService.this);
             mNotification.show();
 
@@ -136,7 +136,7 @@ public class MumlaService extends HumlaService implements
         public void onConnected() {
             if (mNotification != null) {
                 mNotification.setCustomTicker(getString(R.string.mumlaConnected));
-                mNotification.setCustomContentText(getString(R.string.connected) + " (Tor)");
+                mNotification.setCustomContentText(getString(R.string.connected) + (mSettings.isTorEnabled() ? " (Tor)" : ""));
                 mNotification.setActionsShown(true);
                 mNotification.show();
             }
@@ -150,9 +150,9 @@ public class MumlaService extends HumlaService implements
             }
             if (e != null && !mSuppressNotifications) {
                 mReconnectNotification =
-                        MumlaReconnectNotification.show(MumlaService.this, e.getMessage() + " (Tor)",
-                                isReconnecting(),
-                                MumlaService.this);
+                        MumlaReconnectNotification.show(MumlaService.this,
+                                e.getMessage() + (mSettings.isTorEnabled() ? " (Tor)" : ""),
+                                isReconnecting(), MumlaService.this);
             }
         }
 
-- 
cgit v1.2.3