From 4d9018316fa5a9af714de44224a440e0fa78be57 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Mon, 31 Jul 2023 17:50:04 +0200
Subject: add cancel button, call provider stetup command in
 ConfigureProviderFragment and listen to the result, implementing happy path

---
 .../providersetup/activities/SetupActivity.java    | 43 ++++++++++++++++++++--
 1 file changed, 39 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
index f62f959d..33e9cbbd 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
@@ -4,6 +4,8 @@ import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static androidx.appcompat.app.ActionBar.DISPLAY_SHOW_CUSTOM;
 
+import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.OFF;
+
 import androidx.annotation.ColorInt;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -13,22 +15,29 @@ import androidx.viewpager2.widget.ViewPager2;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
-import android.widget.Button;
 import android.widget.Toast;
 
+import java.util.HashSet;
+import java.util.Iterator;
+
 import se.leap.bitmaskclient.BuildConfig;
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.base.views.ActionBarTitle;
 import se.leap.bitmaskclient.databinding.ActivitySetupBinding;
 import se.leap.bitmaskclient.providersetup.SetupViewPagerAdapter;
+import se.leap.bitmaskclient.tor.TorServiceCommand;
+import se.leap.bitmaskclient.tor.TorStatusObservable;
 
-public class SetupActivity extends AppCompatActivity implements SetupInterface {
+public class SetupActivity extends AppCompatActivity implements SetupActivityCallback {
 
+    private static final String TAG = SetupActivity.class.getSimpleName();
     ActivitySetupBinding binding;
     Provider provider;
+    private final HashSet<CancelCallback> cancelCallbacks = new HashSet<>();
 
     @SuppressLint("ClickableViewAccessibility")
     @Override
@@ -66,6 +75,17 @@ public class SetupActivity extends AppCompatActivity implements SetupInterface {
             }
             binding.viewPager.setCurrentItem(newPos);
         });
+        binding.setupCancelButton.setOnClickListener(v -> {
+            binding.viewPager.setCurrentItem(0, false);
+            if (TorStatusObservable.getStatus() != OFF) {
+                Log.d(TAG, "SHUTDOWN - cancelSettingUpProvider");
+                TorServiceCommand.stopTorServiceAsync(this);
+            }
+            provider = null;
+            for (CancelCallback cancelCallback : cancelCallbacks) {
+                cancelCallback.onCanceled();
+            }
+        });
         setupActionBar();
     }
 
@@ -115,14 +135,24 @@ public class SetupActivity extends AppCompatActivity implements SetupInterface {
         binding.viewPager.unregisterOnPageChangeCallback(callback);
     }
 
+    @Override
+    public void registerCancelCallback(CancelCallback cancelCallback) {
+        cancelCallbacks.add(cancelCallback);
+    }
+
+    @Override
+    public void removeCancelCallback(CancelCallback cancelCallback) {
+        cancelCallbacks.remove(cancelCallback);
+    }
+
     @Override
     public void setNavigationButtonHidden(boolean isHidden) {
         binding.setupNextButton.setVisibility(isHidden ? GONE : VISIBLE);
     }
 
     @Override
-    public void onCanceled() {
-        binding.viewPager.setCurrentItem(0);
+    public void setCancelButtonHidden(boolean isHidden) {
+        binding.setupCancelButton.setVisibility(isHidden ? GONE : VISIBLE);
     }
 
     @Override
@@ -130,6 +160,11 @@ public class SetupActivity extends AppCompatActivity implements SetupInterface {
         this.provider = provider;
     }
 
+    @Override
+    public void onConfigurationSuccess() {
+        binding.viewPager.setCurrentItem(binding.viewPager.getCurrentItem() + 1);
+    }
+
     @Override
     public Provider getSelectedProvider() {
         return provider;
-- 
cgit v1.2.3