chore(deps): bump org.fossify.commons from 6.1.6 to 7.1.0

app/build.gradle.kts

@@ -82,7 +82,6 @@ android {
 
     flavorDimensions.add("variants")
     productFlavors {
-        register("core")
         register("foss")
         register("gplay")
     }

app/src/foss/res/values/bools.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">true</bool>
-    <bool name="hide_google_relations">true</bool>
-    <bool name="pretend_thank_you_installed">true</bool>
+    <bool name="is_google_play_build">false</bool>
 </resources>

app/src/gplay/res/values/bools.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">false</bool>
-    <bool name="hide_google_relations">false</bool>
-    <bool name="pretend_thank_you_installed">true</bool>
+    <bool name="is_google_play_build">true</bool>
 </resources>

app/src/main/kotlin/org/fossify/phone/activities/MainActivity.kt

@@ -202,7 +202,7 @@ class MainActivity : SimpleActivity() {
             findItem(R.id.create_new_contact).isVisible = currentFragment == getContactsFragment()
             findItem(R.id.change_view_type).isVisible = currentFragment == getFavoritesFragment()
             findItem(R.id.column_count).isVisible = currentFragment == getFavoritesFragment() && config.viewType == VIEW_TYPE_GRID
-            findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
+            findItem(R.id.more_apps_from_us).isVisible = resources.getBoolean(R.bool.is_google_play_build)
         }
     }
 
@@ -569,7 +569,7 @@ class MainActivity : SimpleActivity() {
             FAQItem(R.string.faq_9_title_commons, R.string.faq_9_text_commons)
         )
 
-        if (!resources.getBoolean(R.bool.hide_google_relations)) {
+        if (resources.getBoolean(R.bool.is_google_play_build)) {
             faqItems.add(FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons))
             faqItems.add(FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons))
         }

app/src/main/kotlin/org/fossify/phone/activities/SettingsActivity.kt

@@ -9,14 +9,11 @@ import kotlinx.serialization.SerializationException
 import kotlinx.serialization.json.Json
 import org.fossify.commons.activities.ManageBlockedNumbersActivity
 import org.fossify.commons.dialogs.ChangeDateTimeFormatDialog
-import org.fossify.commons.dialogs.FeatureLockedDialog
 import org.fossify.commons.dialogs.RadioGroupDialog
-import org.fossify.commons.extensions.addLockedLabelIfNeeded
 import org.fossify.commons.extensions.baseConfig
 import org.fossify.commons.extensions.beVisibleIf
 import org.fossify.commons.extensions.getFontSizeText
 import org.fossify.commons.extensions.getProperPrimaryColor
-import org.fossify.commons.extensions.isOrWasThankYouInstalled
 import org.fossify.commons.extensions.showErrorToast
 import org.fossify.commons.extensions.toast
 import org.fossify.commons.extensions.updateTextColors
@@ -184,15 +181,11 @@ class SettingsActivity : SimpleActivity() {
 
     private fun setupManageBlockedNumbers() {
         binding.apply {
-            settingsManageBlockedNumbersLabel.text = addLockedLabelIfNeeded(R.string.manage_blocked_numbers)
+            settingsManageBlockedNumbersLabel.text = getString(R.string.manage_blocked_numbers)
             settingsManageBlockedNumbersHolder.beVisibleIf(isNougatPlus())
             settingsManageBlockedNumbersHolder.setOnClickListener {
-                if (isOrWasThankYouInstalled()) {
-                    Intent(this@SettingsActivity, ManageBlockedNumbersActivity::class.java).apply {
-                        startActivity(this)
-                    }
-                } else {
-                    FeatureLockedDialog(this@SettingsActivity) { }
+                Intent(this@SettingsActivity, ManageBlockedNumbersActivity::class.java).apply {
+                    startActivity(this)
                 }
             }
         }

app/src/main/kotlin/org/fossify/phone/adapters/ContactsAdapter.kt

@@ -20,7 +20,6 @@ import org.fossify.commons.adapters.MyRecyclerViewAdapter
 import org.fossify.commons.databinding.ItemContactWithoutNumberBinding
 import org.fossify.commons.databinding.ItemContactWithoutNumberGridBinding
 import org.fossify.commons.dialogs.ConfirmationDialog
-import org.fossify.commons.dialogs.FeatureLockedDialog
 import org.fossify.commons.extensions.*
 import org.fossify.commons.helpers.*
 import org.fossify.commons.interfaces.ItemMoveCallback
@@ -92,7 +91,7 @@ class ContactsAdapter(
             findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && (activity.config.getCustomSIM(selectedNumber) ?: "") != ""
 
             findItem(R.id.cab_delete).isVisible = showDeleteButton
-            findItem(R.id.cab_create_shortcut).title = activity.addLockedLabelIfNeeded(R.string.create_shortcut)
+            findItem(R.id.cab_create_shortcut).title = activity.getString(R.string.create_shortcut)
             findItem(R.id.cab_create_shortcut).isVisible = isOneItemSelected && isOreoPlus()
             findItem(R.id.cab_view_details).isVisible = isOneItemSelected
             findItem(R.id.cab_block_unblock_contact).isVisible = isOneItemSelected && isNougatPlus()
@@ -115,7 +114,7 @@ class ContactsAdapter(
             R.id.cab_delete -> askConfirmDelete()
             R.id.cab_send_sms -> sendSMS()
             R.id.cab_view_details -> viewContactDetails()
-            R.id.cab_create_shortcut -> tryCreateShortcut()
+            R.id.cab_create_shortcut -> createShortcut()
             R.id.cab_select_all -> selectAll()
         }
     }
@@ -168,23 +167,19 @@ class ContactsAdapter(
                 R.string.block_contact
             }
 
-            callback(activity.addLockedLabelIfNeeded(cabItemTitleRes))
+            callback(activity.getString(cabItemTitleRes))
         }
     }
 
     private fun tryBlockingUnblocking() {
         val contact = getSelectedItems().firstOrNull() ?: return
 
-        if (activity.isOrWasThankYouInstalled()) {
-            activity.isContactBlocked(contact) { blocked ->
-                if (blocked) {
-                    tryUnblocking(contact)
-                } else {
-                    tryBlocking(contact)
-                }
+        activity.isContactBlocked(contact) { blocked ->
+            if (blocked) {
+                tryUnblocking(contact)
+            } else {
+                tryBlocking(contact)
             }
-        } else {
-            FeatureLockedDialog(activity) { }
         }
     }
 
@@ -316,14 +311,6 @@ class ContactsAdapter(
         return getSelectedItems().firstOrNull()?.getPrimaryNumber()
     }
 
-    private fun tryCreateShortcut() {
-        if (activity.isOrWasThankYouInstalled()) {
-            createShortcut()
-        } else {
-            FeatureLockedDialog(activity) { }
-        }
-    }
-
     @SuppressLint("NewApi")
     private fun createShortcut() {
         val contact = contacts.firstOrNull { selectedKeys.contains(it.rawId) } ?: return

app/src/main/kotlin/org/fossify/phone/adapters/RecentCallsAdapter.kt

@@ -21,9 +21,7 @@ import com.google.i18n.phonenumbers.Phonenumber
 import com.google.i18n.phonenumbers.geocoding.PhoneNumberOfflineGeocoder
 import org.fossify.commons.adapters.MyRecyclerViewListAdapter
 import org.fossify.commons.dialogs.ConfirmationDialog
-import org.fossify.commons.dialogs.FeatureLockedDialog
 import org.fossify.commons.extensions.addBlockedNumber
-import org.fossify.commons.extensions.addLockedLabelIfNeeded
 import org.fossify.commons.extensions.adjustAlpha
 import org.fossify.commons.extensions.adjustForContrast
 import org.fossify.commons.extensions.applyColorFilter
@@ -39,7 +37,6 @@ import org.fossify.commons.extensions.getPopupMenuTheme
 import org.fossify.commons.extensions.getProperTextColor
 import org.fossify.commons.extensions.getTextSize
 import org.fossify.commons.extensions.highlightTextPart
-import org.fossify.commons.extensions.isOrWasThankYouInstalled
 import org.fossify.commons.extensions.launchSendSMSIntent
 import org.fossify.commons.extensions.setupViewBackground
 import org.fossify.commons.helpers.PERMISSION_WRITE_CALL_LOG
@@ -111,7 +108,7 @@ class RecentCallsAdapter(
             findItem(R.id.cab_call_sim_2).isVisible = hasMultipleSIMs && isOneItemSelected
             findItem(R.id.cab_remove_default_sim).isVisible = isOneItemSelected && (activity.config.getCustomSIM(selectedNumber) ?: "") != ""
 
-            findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(R.string.block_number)
+            findItem(R.id.cab_block_number).title = activity.getString(R.string.block_number)
             findItem(R.id.cab_block_number).isVisible = isNougatPlus()
             findItem(R.id.cab_add_number).isVisible = isOneItemSelected
             findItem(R.id.cab_copy_number).isVisible = isOneItemSelected
@@ -129,7 +126,7 @@ class RecentCallsAdapter(
             R.id.cab_call_sim_1 -> callContact(true)
             R.id.cab_call_sim_2 -> callContact(false)
             R.id.cab_remove_default_sim -> removeDefaultSIM()
-            R.id.cab_block_number -> tryBlocking()
+            R.id.cab_block_number -> askConfirmBlock()
             R.id.cab_add_number -> addNumberToContact()
             R.id.cab_send_sms -> sendSMS()
             R.id.cab_show_call_details -> showCallDetails()
@@ -236,14 +233,6 @@ class RecentCallsAdapter(
         finishActMode()
     }
 
-    private fun tryBlocking() {
-        if (activity.isOrWasThankYouInstalled()) {
-            askConfirmBlock()
-        } else {
-            FeatureLockedDialog(activity) { }
-        }
-    }
-
     private fun askConfirmBlock() {
         val numbers = TextUtils.join(", ", getSelectedItems().distinctBy { it.phoneNumber }.map { it.phoneNumber })
         val baseString = R.string.block_confirmation
@@ -378,7 +367,7 @@ class RecentCallsAdapter(
                 findItem(R.id.cab_add_number).isVisible = !call.isUnknownNumber
                 findItem(R.id.cab_copy_number).isVisible = !call.isUnknownNumber
                 findItem(R.id.cab_show_call_details).isVisible = !call.isUnknownNumber
-                findItem(R.id.cab_block_number).title = activity.addLockedLabelIfNeeded(R.string.block_number)
+                findItem(R.id.cab_block_number).title = activity.getString(R.string.block_number)
                 findItem(R.id.cab_block_number).isVisible = isNougatPlus() && !call.isUnknownNumber
                 findItem(R.id.cab_remove_default_sim).isVisible = (activity.config.getCustomSIM(selectedNumber) ?: "") != "" && !call.isUnknownNumber
             }
@@ -430,7 +419,7 @@ class RecentCallsAdapter(
 
                     R.id.cab_block_number -> {
                         selectedKeys.add(callId)
-                        tryBlocking()
+                        askConfirmBlock()
                     }
 
                     R.id.cab_remove -> {
@@ -675,4 +664,4 @@ class RecentCallsDiffCallback : DiffUtil.ItemCallback<CallLogItem>() {
             else -> false
         }
     }
-}
+}

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ detektCompose = "0.4.28"
 #Eventbus
 eventbus = "3.3.1"
 #Fossify
-commons = "6.1.6"
+commons = "7.1.0"
 #Gradle
 gradlePlugins-agp = "9.4.1"
 #Other