8.31.0 Production

.github/actions/setup-environment/action.yml

@@ -16,12 +16,12 @@ runs:
   steps:
   - name: Set up JDK
     if: ${{ inputs.jdk == 'true' || inputs.gradle == 'true' }}
-    uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+    uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
     with:
       java-version-file: '.java-version'
       distribution: 'temurin'
       # Using 'temurin' speeds up the job, because this distribution is cached by the runner.
       # See: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Hosted-Tool-Cache
   - name: Set up Gradle
     if: ${{ inputs.gradle == 'true' }}
-    uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0 # v4.2.1
+    uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2

Pocket/build.gradle.kts

@@ -15,7 +15,7 @@ plugins {
 }
 
 val versionMajor = 8 // Max value of 200
-val versionMinor = 30 // Max of two digits
+val versionMinor = 31 // Max of two digits
 val versionPatch = 0 // Max of two digits
 val versionBuild = 0 // Max of three digits
 
@@ -274,6 +274,7 @@ dependencies {
     implementation(libs.androidx.fragment)
     implementation(libs.androidx.fragment.compose)
     implementation(libs.androidx.navigation.fragment)
+    implementation(libs.androidx.paging)
 
     implementation(libs.androidx.browser)
     implementation(libs.androidx.media)
@@ -285,7 +286,6 @@ dependencies {
 
     implementation(libs.kotlinx.serialization.json)
 
-    implementation(Deps.Google.GMS.Plus.plus)
     implementation(libs.google.play.billing)
     implementation(Deps.Android.InstallReferrer.installReferrer)
 
@@ -338,7 +338,6 @@ dependencies {
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.compose.ui.test)
     debugImplementation(libs.androidx.compose.ui.test.manifest)
-    implementation(Deps.AndroidX.Test.Espresso.idlingResource)
 
     implementation(Deps.Google.Play.core)
 

Pocket/merged_manifests/playUnsignedRelease/AndroidManifest.xml

@@ -3,8 +3,8 @@
     package="com.ideashower.readitlater.pro"
     android:installLocation="auto"
     android:targetSandboxVersion="2"
-    android:versionCode="83000000"
-    android:versionName="8.30.0.0" >
+    android:versionCode="83100000"
+    android:versionName="8.31.0.0" >
 
     <uses-sdk
         android:minSdkVersion="23"

Pocket/src/main/java/com/pocket/app/AppThreads.java

@@ -3,8 +3,6 @@
 import android.os.Handler;
 import android.os.Looper;
 
-import androidx.test.espresso.IdlingResource;
-
 import com.pocket.sdk.util.thread.PriorityTaskPool;
 import com.pocket.sdk.util.thread.WakefulTaskPool;
 import com.pocket.sdk.util.wakelock.WakeLockManager;
@@ -30,7 +28,7 @@
  * This also has {@link Handler} and Ui Thread related helper methods.
  */
 @Singleton
-public class AppThreads implements IdlingResource {
+public class AppThreads {
 
 	private final Handler handler;
 	private final Thread main;
@@ -250,19 +248,4 @@ private void setup(WakefulTaskPool pool) {
 		pool.setKeepAliveTime(10, TimeUnit.SECONDS);
 		pool.allowCoreThreadTimeOut(true);
 	}
-
-	@Override
-	public String getName() {
-		return pool().getName();
-	}
-
-	@Override
-	public boolean isIdleNow() {
-		return pool().isIdleNow();
-	}
-
-	@Override
-	public void registerIdleTransitionCallback(ResourceCallback callback) {
-		pool().registerIdleTransitionCallback(callback);
-	}
 }

Pocket/src/main/java/com/pocket/app/PocketModule.kt

@@ -8,7 +8,9 @@ import com.pocket.analytics.SnowplowTracker
 import com.pocket.analytics.Tracker
 import com.pocket.app.build.Versioning
 import com.pocket.repository.ItemRepository
+import com.pocket.repository.NotesRepository
 import com.pocket.repository.SyncEngineItemRepository
+import com.pocket.repository.SyncEngineNotesRepository
 import com.pocket.repository.SyncEngineUserRepository
 import com.pocket.repository.UserRepository
 import com.pocket.sdk.Pocket
@@ -160,4 +162,7 @@ abstract class PocketInterfaces {
 
     @Binds @Singleton
     abstract fun userRepository(syncEngineUserRepository: SyncEngineUserRepository): UserRepository
+
+    @Binds @Singleton
+    abstract fun notesRepository(syncEngineNotesRepository: SyncEngineNotesRepository): NotesRepository
 }

Pocket/src/main/java/com/pocket/data/models/Note.kt

@@ -0,0 +1,36 @@
+package com.pocket.data.models
+
+import com.pocket.sdk.api.generated.thing.Note as SyncEngineNote
+import com.pocket.sdk.api.value.IdString
+import com.pocket.sdk.api.value.MarkdownString
+import org.threeten.bp.Instant
+
+/**
+ * A Note may contain user-generated rich text content,
+ * extracted components from websites (clippings),
+ * and may be linked to a source url.
+ *
+ * @param contentPreview Markdown preview of the note content for summary view.
+ * @param doc Markdown representation of the note content.
+ */
+data class Note(
+    val id: Id,
+    val title: String?,
+    val contentPreview: MarkdownString,
+    val doc: MarkdownString,
+    val createdAt: Instant?,
+    val updatedAt: Instant,
+) {
+    @JvmInline value class Id(val value: String)
+}
+
+fun SyncEngineNote.toNote() = Note(
+    id = Note.Id(id!!.id),
+    title = title,
+    contentPreview = contentPreview!!,
+    doc = docMarkdown!!,
+    createdAt = null,
+    updatedAt = updatedAt!!.toInstant()
+)
+
+fun Note.Id.toIdString() = IdString(value)