From c3edd5f37051f9dcb598eb176b12e8e05f03803e Mon Sep 17 00:00:00 2001
From: Pierre Nicolas <pierre.nicolas@savoirfairelinux.com>
Date: Fri, 21 Jun 2024 14:53:53 -0400
Subject: [PATCH] donation: hide donation button properly
GitLab: #1695
Change-Id: Ib015c5310fd274e4ece6e9bb4e0934e6295dec94
---
.../app/src/main/java/cx/ring/settings/SettingsFragment.kt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/jami-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt b/jami-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt
index f11d4991d..68ccf1fc8 100644
--- a/jami-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt
+++ b/jami-android/app/src/main/java/cx/ring/settings/SettingsFragment.kt
@@ -48,6 +48,7 @@ import net.jami.model.Settings
import net.jami.mvp.GenericView
import net.jami.settings.SettingsPresenter
import net.jami.settings.SettingsViewModel
+import net.jami.utils.DonationUtils
import net.jami.utils.DonationUtils.endDonationTimeMillis
import net.jami.utils.DonationUtils.startDonationTimeMillis
@@ -74,7 +75,7 @@ class SettingsFragment :
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
FragSettingsBinding.inflate(inflater, container, false).apply {
- if (System.currentTimeMillis() in startDonationTimeMillis until endDonationTimeMillis) {
+ if (DonationUtils.isDonationPeriod()) {
donateButton.visibility= View.VISIBLE
settingsDonateLayout.visibility = View.VISIBLE
donateButton.setOnClickListener {
@@ -198,7 +199,7 @@ class SettingsFragment :
childFragmentManager.popBackStackImmediate()
if (childFragmentManager.backStackEntryCount == 0) {
val binding = binding ?: return
- binding.donateButton.isVisible = true
+ binding.donateButton.isVisible = DonationUtils.isDonationPeriod()
onAppBarScrollTargetViewChanged(binding.scrollview)
onToolbarTitleChanged(getString(R.string.menu_item_advanced_settings))
backPressedCallback.isEnabled = false
--
GitLab