From 2967621c3e068a149b5b89e98bc2afd148e8a11c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 23 May 2020 21:33:34 +0200
Subject: [PATCH] fetch the proper default tab, if some tabs arent shown

---
 .../contacts/pro/activities/MainActivity.kt   | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
index d8a9a8b0..880f9b88 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
@@ -55,7 +55,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
     private var isFirstResume = true
     private var isGettingContacts = false
     private var ignoredExportContactSources = HashSet<String>()
-    private var handledShowTabs = 0
 
     private var storedTextColor = 0
     private var storedBackgroundColor = 0
@@ -71,9 +70,9 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
         setContentView(R.layout.activity_main)
         appLaunched(BuildConfig.APPLICATION_ID)
 
+        storeStateVariables()
         setupTabColors()
         checkContactPermissions()
-        storeStateVariables()
         checkWhatsNewDialog()
         checkDialerMigrationDialog()
     }
@@ -339,7 +338,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
     }
 
     private fun setupTabColors() {
-        handledShowTabs = config.showTabs
         val lastUsedPage = getDefaultTab()
         main_tabs_holder.apply {
             background = ColorDrawable(config.backgroundColor)
@@ -596,11 +594,28 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
     private fun getAllFragments() = arrayListOf(contacts_fragment, favorites_fragment, groups_fragment)
 
     private fun getDefaultTab(): Int {
+        val showTabsMask = config.showTabs
         return when (config.defaultTab) {
             TAB_LAST_USED -> config.lastUsedViewPagerPage
             TAB_CONTACTS -> 0
-            TAB_FAVORITES -> 1
-            else -> 2
+            TAB_FAVORITES -> {
+                if (showTabsMask and TAB_CONTACTS > 0) {
+                    1
+                } else {
+                    0
+                }
+            }
+            else -> {
+                if (showTabsMask and TAB_CONTACTS > 0) {
+                    if (showTabsMask and TAB_FAVORITES > 0) {
+                        2
+                    } else {
+                        1
+                    }
+                } else {
+                    0
+                }
+            }
         }
     }