Fix import

Author: Isira-Seneviratne

app/build.gradle

@@ -179,7 +179,6 @@ dependencies {
     implementation libs.kotlinx.coroutines.core
     implementation libs.kotlinx.coroutines.android
     implementation libs.kotlinx.serialization.json
-    implementation libs.kotlinx.datetime
 
     implementation libs.material
     implementation libs.appcompat

app/src/main/java/org/wikipedia/notifications/NotificationActivity.kt

@@ -36,7 +36,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.tabs.TabLayout
 import kotlinx.coroutines.launch
-import kotlinx.datetime.toJavaInstant
 import org.wikipedia.Constants
 import org.wikipedia.R
 import org.wikipedia.WikipediaApp
@@ -65,6 +64,8 @@ import org.wikipedia.views.NotificationActionsOverflowView
 import org.wikipedia.views.SearchAndFilterActionProvider
 import org.wikipedia.views.SwipeableItemTouchHelperCallback
 import org.wikipedia.views.WikiCardView
+import kotlin.time.ExperimentalTime
+import kotlin.time.toJavaInstant
 
 class NotificationActivity : BaseActivity() {
     private lateinit var binding: ActivityNotificationsBinding
@@ -391,6 +392,7 @@ class NotificationActivity : BaseActivity() {
                 }
             }
 
+            @OptIn(ExperimentalTime::class)
             binding.notificationTime.text = DateUtil.formatRelativeTime(n.instant().toJavaInstant())
             binding.notificationTime.setTextColor(if (n.isUnread) primaryColor else inactiveColor)
             binding.notificationOverflowMenu.imageTintList = if (n.isUnread) primaryColor else inactiveColor

app/src/main/java/org/wikipedia/notifications/PollNotificationWorker.kt

@@ -7,19 +7,21 @@ import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
-import kotlinx.datetime.Instant
 import org.wikipedia.WikipediaApp
 import org.wikipedia.csrf.CsrfTokenClient
 import org.wikipedia.dataclient.ServiceFactory
 import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.dataclient.mwapi.MwException
 import org.wikipedia.settings.Prefs
 import org.wikipedia.util.log.L
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 class PollNotificationWorker(
     private val appContext: Context,
     params: WorkerParameters
 ) : CoroutineWorker(appContext, params) {
+    @OptIn(ExperimentalTime::class)
     override suspend fun doWork(): Result {
         return try {
             val response = ServiceFactory.get(WikipediaApp.instance.wikiSite).lastUnreadNotification()

app/src/main/java/org/wikipedia/notifications/db/Notification.kt

@@ -1,8 +1,6 @@
 package org.wikipedia.notifications.db
 
 import androidx.room.Entity
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.JsonElement
@@ -14,6 +12,9 @@ import org.wikipedia.dataclient.WikiSite
 import org.wikipedia.json.JsonUtil
 import org.wikipedia.page.Namespace
 import org.wikipedia.util.UriUtil
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 @Serializable
 @Entity(primaryKeys = ["id", "wiki"])
@@ -37,6 +38,7 @@ class Notification(var id: Long = 0,
         return id + wiki.hashCode()
     }
 
+    @OptIn(ExperimentalTime::class)
     fun instant(): Instant {
         return timestamp?.instant ?: Clock.System.now()
     }
@@ -66,6 +68,7 @@ class Notification(var id: Long = 0,
     }
 
     @Serializable
+    @OptIn(ExperimentalTime::class)
     class Timestamp(@SerialName("utciso8601") val instant: Instant)
 
     @Serializable

app/src/main/java/org/wikipedia/settings/Prefs.kt

@@ -1,7 +1,6 @@
 package org.wikipedia.settings
 
 import android.location.Location
-import kotlinx.datetime.Instant
 import okhttp3.Cookie
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.logging.HttpLoggingInterceptor
@@ -29,6 +28,9 @@ import org.wikipedia.util.ReleaseUtil.isDevRelease
 import org.wikipedia.util.StringUtil
 import org.wikipedia.watchlist.WatchlistFilterTypes
 import java.util.Date
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 /** Shared preferences utility for convenient POJO access.  */
 object Prefs {
@@ -374,10 +376,11 @@ object Prefs {
         get() = PrefsIoUtil.getBoolean(R.string.preference_key_reading_lists_first_time_sync, true)
         set(value) = PrefsIoUtil.setBoolean(R.string.preference_key_reading_lists_first_time_sync, value)
 
+    @OptIn(ExperimentalTime::class)
     var remoteNotificationsSeenTime: Instant
         get() {
             val timestamp = PrefsIoUtil.getString(R.string.preference_key_remote_notifications_seen_time, "")!!
-            return if (timestamp.isEmpty()) Instant.fromEpochMilliseconds(0) else Instant.parse(timestamp)
+            return Instant.parseOrNull(timestamp) ?: Clock.System.now()
         }
         set(seenTime) = PrefsIoUtil.setString(R.string.preference_key_remote_notifications_seen_time, seenTime.toString())
 

gradle/libs.versions.toml

@@ -46,7 +46,6 @@ swiperefreshlayout = "1.1.0"
 uiautomator = "2.3.0"
 viewpager2 = "1.1.0"
 workRuntimeKtx = "2.10.2"
-kotlinxDatetime = "0.7.1"
 composeBom = "2025.07.00"
 composeActivity = "1.10.1"
 composeViewModel = "2.9.2"
@@ -91,7 +90,6 @@ junit = { module = "junit:junit", version.ref = "junit" }
 kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinStdlibJdk8" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinCoroutinesVersion" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinCoroutinesVersion" }
-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
 leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakCanaryVersion" }
 material = { module = "com.google.android.material:material", version.ref = "material" }