From cdb7f0736827c668ed4d7ce85bece8b3a92dd819 Mon Sep 17 00:00:00 2001
From: Sgn-32 <49990901+Sgn-32@users.noreply.github.com>
Date: Fri, 7 Oct 2022 22:46:32 +0200
Subject: [PATCH] Add ability to clear the proxy address.

Closes #12499
---
 .../securesms/preferences/EditProxyFragment.java  | 15 +++++++++------
 .../securesms/preferences/EditProxyViewModel.java |  9 ++++++---
 .../securesms/util/SignalProxyUtil.java           |  5 +++++
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
index 1e11a660fa..caa7231ba2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
@@ -73,7 +73,7 @@ public class EditProxyFragment extends Fragment {
 
     saveButton.setOnClickListener(v -> onSaveClicked());
     shareButton.setOnClickListener(v -> onShareClicked());
-    proxySwitch.setOnCheckedChangeListener((buttonView, isChecked) -> viewModel.onToggleProxy(isChecked));
+    proxySwitch.setOnCheckedChangeListener((buttonView, isChecked) -> viewModel.onToggleProxy(isChecked, proxyText.getText().toString()));
 
     LearnMoreTextView description = view.findViewById(R.id.edit_proxy_switch_title_description);
     description.setLearnMoreVisible(true);
@@ -103,6 +103,8 @@ public class EditProxyFragment extends Fragment {
       case ALL_ENABLED:
         proxyText.setEnabled(true);
         proxyText.setAlpha(1);
+        saveButton.setEnabled(true);
+        saveButton.setAlpha(1);
         proxyTitle.setAlpha(1);
         onProxyTextChanged(proxyText.getText().toString());
         break;
@@ -182,7 +184,12 @@ public class EditProxyFragment extends Fragment {
   }
 
   private void onSaveClicked() {
-    viewModel.onSaveClicked(proxyText.getText().toString());
+    String text = proxyText.getText().toString();
+    if (Util.isEmpty(text)) {
+      proxySwitch.setChecked(false);
+    } else {
+      viewModel.onSaveClicked(text);
+    }
   }
 
   private void onShareClicked() {
@@ -195,14 +202,10 @@ public class EditProxyFragment extends Fragment {
 
   private void onProxyTextChanged(@NonNull String text) {
     if (Util.isEmpty(text)) {
-      saveButton.setEnabled(false);
-      saveButton.setAlpha(0.5f);
       shareButton.setEnabled(false);
       shareButton.setAlpha(0.5f);
       proxyStatus.setVisibility(View.INVISIBLE);
     } else {
-      saveButton.setEnabled(true);
-      saveButton.setAlpha(1);
       shareButton.setEnabled(true);
       shareButton.setAlpha(1);
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyViewModel.java
index 6d68eb9f78..f7347e3f77 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyViewModel.java
@@ -43,7 +43,7 @@ public class EditProxyViewModel extends ViewModel {
     }
   }
 
-  void onToggleProxy(boolean enabled) {
+  void onToggleProxy(boolean enabled, String text) {
     if (enabled) {
       SignalProxy currentProxy = SignalStore.proxy().getProxy();
 
@@ -51,9 +51,12 @@ public class EditProxyViewModel extends ViewModel {
         SignalProxyUtil.enableProxy(currentProxy);
       }
       uiState.postValue(UiState.ALL_ENABLED);
+    } else if (Util.isEmpty(text)) {
+        SignalProxyUtil.disableAndClearProxy();
+        uiState.postValue(UiState.ALL_DISABLED);
     } else {
-      SignalProxyUtil.disableProxy();
-      uiState.postValue(UiState.ALL_DISABLED);
+        SignalProxyUtil.disableProxy();
+        uiState.postValue(UiState.ALL_DISABLED);
     }
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java
index f85c7dd88b..92b1864d54 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SignalProxyUtil.java
@@ -67,6 +67,11 @@ public final class SignalProxyUtil {
     startListeningToWebsocket();
   }
 
+  public static void disableAndClearProxy(){
+    disableProxy();
+    SignalStore.proxy().setProxy(null);
+  }
+
   /**
    * A blocking call that will wait until the websocket either successfully connects, or fails.
    * It is assumed that the app state is already configured how you would like it, e.g. you've