From eeaceabf0a3896570330ac2d586508b8088557f8 Mon Sep 17 00:00:00 2001
From: MohitMali <futuretechnoworld.mohit@gmail.com>
Date: Tue, 11 Jul 2023 12:41:03 +0530
Subject: [PATCH] Fixed test failure

---
 .../kiwixmobile/core/base/BaseFragment.kt      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragment.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragment.kt
index 3bd504648..7a476206f 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragment.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/base/BaseFragment.kt
@@ -46,20 +46,20 @@ abstract class BaseFragment : Fragment() {
     setupToolbar()
   }
 
-  // Setup toolbar to handle back pressed event
+  // Setup toolbar to handle common back pressed event
   private fun setupToolbar() {
     val activity = activity as AppCompatActivity?
     fragmentToolbar?.apply {
-      activity?.setSupportActionBar(this)
-      setNavigationOnClickListener {
-        activity?.apply {
-          onBackPressedDispatcher.onBackPressed()
-          supportActionBar?.let { actionBar ->
-            actionBar.setDisplayHomeAsUpEnabled(true)
-            fragmentTitle?.let { title = it }
-          }
+      activity?.let {
+        it.setSupportActionBar(this)
+        it.supportActionBar?.let { actionBar ->
+          actionBar.setDisplayHomeAsUpEnabled(true)
+          title = fragmentTitle
         }
       }
+      setNavigationOnClickListener {
+        activity?.onBackPressedDispatcher?.onBackPressed()
+      }
     }
   }
 }