Skip to content

Commit

Permalink
Merge branch 'release/5.196.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@daxtheduck
daxtheduck committed Apr 4, 2024
2 parents 8d89ebb + 6839286 commit d64eece
Show file tree
Hide file tree
Showing 133 changed files with 3,232 additions and 682 deletions.
4 changes: 4 additions & 0 deletions ...impl/src/main/java/com/duckduckgo/mobile/android/vpn/feature/removal/VpnFeatureRemover.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ import com.duckduckgo.mobile.android.vpn.store.VpnDatabase
import com.duckduckgo.mobile.android.vpn.ui.notification.AndroidDeviceShieldAlertNotificationBuilder
import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldNotificationScheduler.Companion.VPN_DAILY_NOTIFICATION_ID
import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldNotificationScheduler.Companion.VPN_WEEKLY_NOTIFICATION_ID
import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldNotificationScheduler.Companion.WORKER_VPN_DAILY_NOTIFICATION_NAME
import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldNotificationScheduler.Companion.WORKER_VPN_WEEKLY_NOTIFICATION_TAG
import com.duckduckgo.mobile.android.vpn.ui.onboarding.VpnStore
import com.squareup.anvil.annotations.ContributesBinding
import javax.inject.Inject
Expand Down Expand Up @@ -68,6 +70,8 @@ class DefaultVpnFeatureRemover @Inject constructor(
val workManager = workManagerProvider.get()
workManager.cancelAllWorkByTag(VpnReminderNotificationWorker.WORKER_VPN_REMINDER_UNDESIRED_TAG)
workManager.cancelAllWorkByTag(VpnReminderNotificationWorker.WORKER_VPN_REMINDER_DAILY_TAG)
workManager.cancelAllWorkByTag(WORKER_VPN_DAILY_NOTIFICATION_NAME)
workManager.cancelAllWorkByTag(WORKER_VPN_WEEKLY_NOTIFICATION_TAG)
}

override fun scheduledRemoveFeature() {
Expand Down
160 changes: 66 additions & 94 deletions ...va/com/duckduckgo/mobile/android/vpn/ui/notification/DeviceShieldNotificationScheduler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,94 +21,71 @@ import android.content.Context
import android.content.pm.PackageManager
import androidx.core.app.ActivityCompat
import androidx.core.app.NotificationManagerCompat
import androidx.lifecycle.LifecycleOwner
import androidx.work.*
import com.duckduckgo.anvil.annotations.ContributesWorker
import com.duckduckgo.app.di.AppCoroutineScope
import com.duckduckgo.app.lifecycle.MainProcessLifecycleObserver
import com.duckduckgo.common.utils.DispatcherProvider
import com.duckduckgo.di.scopes.AppScope
import com.duckduckgo.mobile.android.vpn.dao.VpnNotification
import com.duckduckgo.mobile.android.vpn.dao.VpnNotificationsDao
import com.duckduckgo.mobile.android.vpn.cohort.CohortStore
import com.duckduckgo.mobile.android.vpn.pixels.DeviceShieldPixels
import com.duckduckgo.mobile.android.vpn.service.VpnServiceCallbacks
import com.duckduckgo.mobile.android.vpn.state.VpnStateMonitor.VpnStopReason
import com.duckduckgo.mobile.android.vpn.stats.AppTrackerBlockingStatsRepository
import com.duckduckgo.mobile.android.vpn.store.VpnDatabase
import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldNotificationScheduler.Companion
import com.squareup.anvil.annotations.ContributesTo
import dagger.Module
import dagger.Provides
import dagger.multibindings.IntoSet
import com.duckduckgo.mobile.android.vpn.ui.notification.DeviceShieldNotificationScheduler.Companion.VPN_DAILY_NOTIFICATION_ID
import com.squareup.anvil.annotations.ContributesMultibinding
import java.time.LocalDate
import java.time.temporal.ChronoUnit
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import kotlinx.coroutines.*
import logcat.logcat

@Module
@ContributesTo(AppScope::class)
object DeviceShieldNotificationSchedulerModule {
@Provides
@IntoSet
fun provideDeviceShieldNotificationScheduler(
@AppCoroutineScope appCoroutineScope: CoroutineScope,
workManager: WorkManager,
vpnDatabase: VpnDatabase,
dispatchers: DispatcherProvider,
): MainProcessLifecycleObserver {
return DeviceShieldNotificationScheduler(appCoroutineScope, workManager, vpnDatabase, dispatchers)
}

@Provides
fun provideVpnNotificationsDao(vpnDatabase: VpnDatabase): VpnNotificationsDao = vpnDatabase.vpnNotificationsDao()
}

class DeviceShieldNotificationScheduler(
private val coroutineScope: CoroutineScope,
@ContributesMultibinding(AppScope::class)
class DeviceShieldNotificationScheduler @Inject constructor(
private val workManager: WorkManager,
private val vpnDatabase: VpnDatabase,
private val cohortStore: CohortStore,
private val dispatchers: DispatcherProvider,
) : MainProcessLifecycleObserver {
) : VpnServiceCallbacks {

override fun onVpnStarted(coroutineScope: CoroutineScope) {
coroutineScope.launch(dispatchers.io()) {
scheduleDailyNotification()
scheduleWeeklyNotification()
}
}

override fun onCreate(owner: LifecycleOwner) {
scheduleDailyNotification()
scheduleWeeklyNotification()
override fun onVpnStopped(
coroutineScope: CoroutineScope,
vpnStopReason: VpnStopReason,
) {
// noop
}

private fun scheduleDailyNotification() {
val vpnNotificationsDao = vpnDatabase.vpnNotificationsDao()
coroutineScope.launch(dispatchers.io()) {
val exists = withContext(dispatchers.io()) {
vpnNotificationsDao.exists(VPN_DAILY_NOTIFICATION_ID)
}
if (exists) {
val timesRun = withContext(dispatchers.io()) {
vpnNotificationsDao.get(VPN_DAILY_NOTIFICATION_ID).timesRun
}
if (timesRun > TOTAL_DAILY_NOTIFICATIONS) {
logcat { "Vpn Daily notification has ran $timesRun times, we don't need to ran it anymore" }

val workQuery = WorkQuery.Builder
.fromUniqueWorkNames(listOf(WORKER_VPN_DAILY_NOTIFICATION_NAME))
.build()

val workInfo = workManager.getWorkInfos(workQuery).get()
if (workInfo.isEmpty()) {
logcat { "Vpn Daily notification has already been removed from WorkManager, nothing to do" }
} else {
workManager.cancelUniqueWork(WORKER_VPN_DAILY_NOTIFICATION_NAME)
logcat { "Vpn Daily notification has now been removed from WorkManager" }
}
} else {
logcat { "Vpn Daily notification has ran $timesRun times out of $TOTAL_DAILY_NOTIFICATIONS" }
}
private suspend fun scheduleDailyNotification() = withContext(dispatchers.io()) {
val daysRun = cohortStore.getCohortStoredLocalDate()?.daysUntilNow() ?: return@withContext

if (daysRun > TOTAL_DAILY_NOTIFICATIONS) {
logcat { "Vpn Daily notification has ran $daysRun times, we don't need to ran it anymore" }

val workQuery = WorkQuery.Builder
.fromUniqueWorkNames(listOf(WORKER_VPN_DAILY_NOTIFICATION_NAME))
.build()

val workInfo = workManager.getWorkInfos(workQuery).get()
if (workInfo.isEmpty()) {
logcat { "Vpn Daily notification has already been removed from WorkManager, nothing to do" }
} else {
logcat { "Scheduling the Vpn Daily notifications worker" }
val dailyNotificationRequest = PeriodicWorkRequestBuilder<DeviceShieldDailyNotificationWorker>(24, TimeUnit.HOURS)
.setBackoffCriteria(BackoffPolicy.LINEAR, 10, TimeUnit.MINUTES)
.setInitialDelay(24, TimeUnit.HOURS)
.build()
vpnNotificationsDao.increment(VPN_DAILY_NOTIFICATION_ID)
workManager.enqueueUniquePeriodicWork(WORKER_VPN_DAILY_NOTIFICATION_NAME, ExistingPeriodicWorkPolicy.KEEP, dailyNotificationRequest)
workManager.cancelUniqueWork(WORKER_VPN_DAILY_NOTIFICATION_NAME)
logcat { "Vpn Daily notification has now been removed from WorkManager" }
}
} else {
logcat { "Scheduling the Vpn Daily notifications worker" }
val dailyNotificationRequest = PeriodicWorkRequestBuilder<DeviceShieldDailyNotificationWorker>(24, TimeUnit.HOURS)
.setBackoffCriteria(BackoffPolicy.LINEAR, 10, TimeUnit.MINUTES)
.setInitialDelay(24, TimeUnit.HOURS)
.addTag(WORKER_VPN_DAILY_NOTIFICATION_NAME)
.build()
workManager.enqueueUniquePeriodicWork(WORKER_VPN_DAILY_NOTIFICATION_NAME, ExistingPeriodicWorkPolicy.KEEP, dailyNotificationRequest)
}
}

Expand All @@ -125,18 +102,20 @@ class DeviceShieldNotificationScheduler(
}

companion object {
private const val WORKER_VPN_DAILY_NOTIFICATION_NAME = "VpnDailyNotification"
private const val WORKER_VPN_WEEKLY_NOTIFICATION_TAG = "VpnWeeklyNotificationWorker"
internal const val WORKER_VPN_DAILY_NOTIFICATION_NAME = "VpnDailyNotification"
internal const val WORKER_VPN_WEEKLY_NOTIFICATION_TAG = "VpnWeeklyNotificationWorker"
private const val WORKER_VPN_WEEKLY_NOTIFICATION_NAME = "VpnWeeklyNotification"
private const val FIRST_WEEKLY_NOTIFICATION_DELAY = 14L

const val TOTAL_DAILY_NOTIFICATIONS = 7L
const val FIRST_WEEKLY_NOTIFICATION_DELAY = 14L

const val VPN_DAILY_NOTIFICATION_ID = 998
const val VPN_WEEKLY_NOTIFICATION_ID = 997
internal const val VPN_DAILY_NOTIFICATION_ID = 998
internal const val VPN_WEEKLY_NOTIFICATION_ID = 997
}
}

private fun LocalDate.daysUntilNow(): Long {
return ChronoUnit.DAYS.between(this, LocalDate.now())
}

@ContributesWorker(AppScope::class)
class DeviceShieldDailyNotificationWorker(
val context: Context,
Expand All @@ -158,32 +137,23 @@ class DeviceShieldDailyNotificationWorker(
lateinit var deviceShieldNotificationFactory: DeviceShieldNotificationFactory

@Inject
lateinit var vpnNotificationsDao: VpnNotificationsDao
lateinit var deviceShieldAlertNotificationBuilder: DeviceShieldAlertNotificationBuilder

@Inject
lateinit var deviceShieldAlertNotificationBuilder: DeviceShieldAlertNotificationBuilder
lateinit var cohortStore: CohortStore

override suspend fun doWork(): Result {
logcat { "Vpn Daily notification worker is now awake" }

if (vpnNotificationsDao.exists(DeviceShieldNotificationScheduler.VPN_DAILY_NOTIFICATION_ID)) {
vpnNotificationsDao.increment(DeviceShieldNotificationScheduler.VPN_DAILY_NOTIFICATION_ID)
val timesRun = vpnNotificationsDao.get(DeviceShieldNotificationScheduler.VPN_DAILY_NOTIFICATION_ID).timesRun
if (timesRun >= DeviceShieldNotificationScheduler.TOTAL_DAILY_NOTIFICATIONS) {
logcat {
"Vpn Daily notification has ran $timesRun times out of" +
" ${DeviceShieldNotificationScheduler.TOTAL_DAILY_NOTIFICATIONS}, we don't need to ran it anymore"
}
return Result.success()
} else {
logcat { "Vpn Daily notification has ran $timesRun times out of ${DeviceShieldNotificationScheduler.TOTAL_DAILY_NOTIFICATIONS}" }
}
val daysRun = cohortStore.getCohortStoredLocalDate()?.daysUntilNow() ?: return Result.success()

if (daysRun >= TOTAL_DAILY_NOTIFICATIONS) {
logcat { "Vpn Daily notification has ran more than $TOTAL_DAILY_NOTIFICATIONS, we don't need to ran it anymore" }
} else {
logcat { "Vpn Daily notification running for the first time" }
vpnNotificationsDao.insert(VpnNotification(DeviceShieldNotificationScheduler.VPN_DAILY_NOTIFICATION_ID, 1))
logcat { "Vpn Daily notification has ran $daysRun times out of $TOTAL_DAILY_NOTIFICATIONS" }
showNotification()
}

showNotification()
return Result.success()
}

Expand All @@ -197,7 +167,7 @@ class DeviceShieldDailyNotificationWorker(
val notification =
deviceShieldAlertNotificationBuilder.buildStatusNotification(context, deviceShieldNotification, notificationPressedHandler)
deviceShieldPixels.didShowDailyNotification(deviceShieldNotification.notificationVariant)
notificationManager.notify(DeviceShieldNotificationScheduler.VPN_DAILY_NOTIFICATION_ID, notification)
notificationManager.notify(VPN_DAILY_NOTIFICATION_ID, notification)
logcat { "Vpn Daily notification is now shown" }
} else {
logcat { "Vpn Daily notification won't be shown because there is no data to show" }
Expand Down Expand Up @@ -248,3 +218,5 @@ class DeviceShieldWeeklyNotificationWorker(
return Result.success()
}
}

private const val TOTAL_DAILY_NOTIFICATIONS = 7L
40 changes: 0 additions & 40 deletions ...ction/vpn-store/src/main/java/com/duckduckgo/mobile/android/vpn/dao/VpnNotificationDao.kt
View file

This file was deleted.

11 changes: 8 additions & 3 deletions ...protection/vpn-store/src/main/java/com/duckduckgo/mobile/android/vpn/store/VpnDatabase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,11 @@ import java.time.format.DateTimeFormatter

@Database(
exportSchema = true,
version = 32,
version = 33,
entities = [
VpnTracker::class,
VpnServiceStateStats::class,
HeartBeatEntity::class,
VpnNotification::class,
AppTracker::class,
AppTrackerMetadata::class,
AppTrackerExcludedPackage::class,
Expand All @@ -56,7 +55,6 @@ abstract class VpnDatabase : RoomDatabase() {

internal abstract fun vpnTrackerDao(): VpnTrackerDao
abstract fun vpnHeartBeatDao(): VpnHeartBeatDao
abstract fun vpnNotificationsDao(): VpnNotificationsDao
abstract fun vpnAppTrackerBlockingDao(): VpnAppTrackerBlockingDao
abstract fun vpnServiceStateDao(): VpnServiceStateStatsDao
abstract fun vpnSystemAppsOverridesDao(): VpnAppTrackerSystemAppsOverridesDao
Expand Down Expand Up @@ -210,6 +208,12 @@ abstract class VpnDatabase : RoomDatabase() {
}
}

private val MIGRATION_32_TO_33: Migration = object : Migration(32, 33) {
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL("DROP TABLE IF EXISTS `vpn_notification`")
}
}

val ALL_MIGRATIONS: List<Migration>
get() = listOf(
MIGRATION_18_TO_19,
Expand All @@ -226,6 +230,7 @@ abstract class VpnDatabase : RoomDatabase() {
MIGRATION_29_TO_30,
MIGRATION_30_TO_31,
MIGRATION_31_TO_32,
MIGRATION_32_TO_33,
)
}
}
Expand Down
2 changes: 2 additions & 0 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,8 @@ dependencies {
// HTML
implementation 'org.jsoup:jsoup:_'

// Browser
implementation "androidx.browser:browser:_"

// Flipper
internalImplementation "com.facebook.flipper:flipper:_"
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/duckduckgo/app/browser/BrowserChromeClientTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class BrowserChromeClientTest {
fun whenOnReceivedTitleThenTitleReceived() {
val title = "title"
testee.onReceivedTitle(webView, title)
verify(mockWebViewClientListener).titleReceived(title)
verify(mockWebViewClientListener).titleReceived(title, webView.url)
}

@Test
Expand Down
Loading

0 comments on commit d64eece

Please sign in to comment.