Merge remote-tracking branch 'origin/develop'

Oztechan · Sep 15, 2021 · 120e6d0 · 120e6d0
2 parents afb0977 + 8b70261
commit 120e6d0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/android/src/main/java/com/github/mustafaozhan/ccc/android/util/Extension.kt b/android/src/main/java/com/github/mustafaozhan/ccc/android/util/Extension.kt
@@ -144,4 +144,4 @@ fun List<PurchaseHistoryRecord>.toPurchaseHistoryList(): List<PurchaseHistory> =
         RemoveAdType.getBySku(purchaseHistoryRecord.skus.firstOrNull())?.let {
             PurchaseHistory(purchaseHistoryRecord.purchaseTime, it)
         }
-    }
+    }
diff --git a/backend/src/jvmMain/kotlin/com/github/mustafaozhan/ccc/backend/controller/ApiController.kt b/backend/src/jvmMain/kotlin/com/github/mustafaozhan/ccc/backend/controller/ApiController.kt
@@ -16,6 +16,8 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 
+private const val NUMBER_OF_REFRESH_IN_DAY = 3
+
 class ApiController(
     private val apiRepository: ApiRepository,
     private val offlineRatesRepository: OfflineRatesRepository
@@ -26,7 +28,7 @@ class ApiController(
             kermit.d { "refreshing" }
             updateCurrencies()
 
-            delay(DAY)
+            delay(DAY / NUMBER_OF_REFRESH_IN_DAY)
         }
     }
 

diff --git a/billing/src/main/kotlin/com/github/mustafaozhan/billing/BillingManager.kt b/billing/src/main/kotlin/com/github/mustafaozhan/billing/BillingManager.kt
@@ -78,10 +78,6 @@ class BillingManager(private val context: Context) :
     fun acknowledgePurchase() {
         acknowledgePurchaseParams?.let {
             billingClient.acknowledgePurchase(it, this)
-        } ?: run {
-            scope.launch {
-                _effect.emit(BillingEffect.SuccessfulPurchase)
-            }
         }
     }
 

diff --git a/...monMain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/adremove/AdRemoveViewModel.kt b/...monMain/kotlin/com/github/mustafaozhan/ccc/client/viewmodel/adremove/AdRemoveViewModel.kt
@@ -10,11 +10,13 @@ import com.github.mustafaozhan.ccc.client.model.PurchaseHistory
 import com.github.mustafaozhan.ccc.client.model.RemoveAdData
 import com.github.mustafaozhan.ccc.client.model.RemoveAdType
 import com.github.mustafaozhan.ccc.client.util.calculateAdRewardEnd
+import com.github.mustafaozhan.ccc.client.util.isRewardExpired
 import com.github.mustafaozhan.ccc.client.util.launchIgnored
 import com.github.mustafaozhan.ccc.common.settings.SettingsRepository
 import com.github.mustafaozhan.ccc.common.util.nowAsLong
 import com.github.mustafaozhan.logmob.kermit
 import com.github.mustafaozhan.scopemob.whether
+import com.github.mustafaozhan.scopemob.whetherNot
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -50,16 +52,18 @@ class AdRemoveViewModel(
         }
     }
 
-
     fun restorePurchase(purchaseHistoryList: List<PurchaseHistory>) = purchaseHistoryList
         .maxByOrNull {
             it.purchaseType.calculateAdRewardEnd(it.purchaseDate)
-        }?.whether { historyRecord ->
-            RemoveAdType.getSkuList().any { it == historyRecord.purchaseType.data.skuId }
-        }?.whether { it.purchaseDate > settingsRepository.adFreeEndDate }
-        ?.apply {
-            updateAddFreeDate(RemoveAdType.getBySku(purchaseType.data.skuId), this.purchaseDate)
+        }?.whether { purchaseHistory ->
+            RemoveAdType.getSkuList().any { it == purchaseHistory.purchaseType.data.skuId }
+        }?.whether {
+            purchaseDate > settingsRepository.adFreeEndDate
+        }?.whetherNot {
+            purchaseType.calculateAdRewardEnd(purchaseDate).isRewardExpired()
+        }?.apply {
             clientScope.launch { _effect.emit(AdRemoveEffect.AlreadyAdFree) }
+            updateAddFreeDate(RemoveAdType.getBySku(purchaseType.data.skuId), this.purchaseDate)
         }
 
     fun showLoadingView(shouldShow: Boolean) {
-Original file line number
+Diff line change
@@ Expand Up @@
             RemoveAdType.getBySku(purchaseHistoryRecord.skus.firstOrNull())?.let {
                 PurchaseHistory(purchaseHistoryRecord.purchaseTime, it)
             }
-        }
+        }