From fb50a5ba450922ad9016facefa0e9e1588f739cd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 14 Feb 2022 14:06:20 -0300
Subject: [PATCH] Remove custom back and action bar code from OfflineFragment

Also pop the offline fragment off the stack when trying again, so it doesn't show up again when we are not offline anymore.
---
 .../android/mailbox/OfflineFragment.java      | 38 ++-----------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java
index 426852f43..fba30ccf6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/OfflineFragment.java
@@ -7,7 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.TextView;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
@@ -16,17 +15,13 @@ import org.briarproject.briar.android.navdrawer.TransportsActivity;
 
 import javax.inject.Inject;
 
-import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.ViewModelProvider;
 
 import static android.view.View.FOCUS_DOWN;
-import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.AppModule.getAndroidComponent;
 
 @MethodsNotNullByDefault
@@ -61,29 +56,17 @@ public class OfflineFragment extends Fragment {
 				.inflate(R.layout.fragment_offline, container, false);
 
 		scrollView = (NestedScrollView) v;
-		TextView titleView = v.findViewById(R.id.titleView);
 		Button checkButton = v.findViewById(R.id.checkButton);
 		checkButton.setOnClickListener(view -> {
 			Intent i = new Intent(requireContext(), TransportsActivity.class);
 			startActivity(i);
 		});
 		buttonView = v.findViewById(R.id.button);
-		buttonView.setOnClickListener(view -> viewModel.tryAgainWhenOffline());
+		buttonView.setOnClickListener(view -> {
+			getParentFragmentManager().popBackStackImmediate();
+			viewModel.tryAgainWhenOffline();
+		});
 
-		AppCompatActivity a = (AppCompatActivity) requireActivity();
-		a.setTitle(titleView.getText());
-		ActionBar actionBar = a.getSupportActionBar();
-		if (actionBar != null) {
-			actionBar.setDisplayHomeAsUpEnabled(false);
-			actionBar.setHomeButtonEnabled(false);
-		}
-		a.getOnBackPressedDispatcher().addCallback(
-				getViewLifecycleOwner(), new OnBackPressedCallback(true) {
-					@Override
-					public void handleOnBackPressed() {
-						onBackButtonPressed();
-					}
-				});
 		return v;
 	}
 
@@ -94,17 +77,4 @@ public class OfflineFragment extends Fragment {
 		scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
 	}
 
-	private void onBackButtonPressed() {
-		MailboxState state = viewModel.getState().getLastValue();
-		MailboxState.OfflineInSetup offline =
-				(MailboxState.OfflineInSetup) requireNonNull(state);
-		if (offline.mailboxProperties == null) {
-			// not yet scanned, go back to previous fragment
-			requireActivity().getSupportFragmentManager().popBackStack();
-		} else {
-			// we had scanned already, so go back to beginning
-			requireActivity().supportFinishAfterTransition();
-		}
-	}
-
 }