Skip to content

Commit

Permalink
Merge branch 'hotfix/5.195.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
marcosholgado committed Mar 29, 2024
2 parents b246eb8 + 7184fdb commit 8d89ebb
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 68 deletions.
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Task/Issue URL:

### Description
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -450,11 +450,6 @@
android:label="@string/downloadsActivityTitle"
android:parentActivityName=".BrowserActivity" />

<service
android:name="com.duckduckgo.app.job.AppConfigurationJobService"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE" />

<service
android:name="com.duckduckgo.widget.FavoritesWidgetService"
android:exported="false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import androidx.sqlite.db.SupportSQLiteDatabase
import com.duckduckgo.app.global.db.AppDatabase
import com.duckduckgo.appbuildconfig.api.*
import com.duckduckgo.common.utils.DispatcherProvider
import com.duckduckgo.common.utils.formatters.time.*
import com.duckduckgo.common.utils.formatters.time.DatabaseDateFormatter
import com.duckduckgo.savedsites.api.models.SavedSitesNames
import com.duckduckgo.savedsites.store.Entity
Expand Down Expand Up @@ -57,7 +56,7 @@ class AppDatabaseBookmarksMigrationCallback(
cleanUpTables()
}

val needsOldFavouritesMigration = needsOldFavouritesMigration()
val needsOldFavouritesMigration = runCatching { needsOldFavouritesMigration() }.getOrDefault(emptyList())
if (needsOldFavouritesMigration.isNotEmpty()) {
runOldFavouritesMigration(needsOldFavouritesMigration)
}
Expand Down Expand Up @@ -195,6 +194,7 @@ class AppDatabaseBookmarksMigrationCallback(
}
}

@Throws(NullPointerException::class)
private fun needsOldFavouritesMigration(): List<Entity> {
// https://app.asana.com/0/0/1204697337057464/f
// during the initial migration of favourites we didn't properly add them to bookmarks
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion app/version/version.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=5.195.0
VERSION=5.195.1
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,12 @@ import com.squareup.anvil.annotations.ContributesBinding
import dagger.SingleInstanceIn
import java.lang.IllegalArgumentException
import javax.inject.Inject
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.suspendCancellableCoroutine
import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
import kotlinx.coroutines.withContext
import logcat.LogPriority.WARN
import logcat.logcat

@OptIn(ExperimentalCoroutinesApi::class)
@ContributesBinding(AppScope::class)
@SingleInstanceIn(AppScope::class)
class RealBillingClientAdapter @Inject constructor(
Expand All @@ -71,7 +72,7 @@ class RealBillingClientAdapter @Inject constructor(
}
.build()

return suspendCancellableCoroutine { continuation ->
return suspendCoroutine { continuation ->
billingClient?.startConnection(
object : BillingClientStateListener {
override fun onBillingServiceDisconnected() {
Expand All @@ -84,7 +85,11 @@ class RealBillingClientAdapter @Inject constructor(
else -> Failure(billingError = p0.responseCode.toBillingError())
}

continuation.resume(result, onCancellation = null)
try {
continuation.resume(result)
} catch (e: IllegalStateException) {
logcat(priority = WARN) { "onBillingSetupFinished() invoked more than once" }
}
}
},
)
Expand Down

0 comments on commit 8d89ebb

Please sign in to comment.