Merge remote-tracking branch 'upstream/main' into mtls

Author: tinsukE

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
           distribution: 'zulu'
           java-version: "21"
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.197.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Run tests

.github/workflows/create-release.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Checkout code
         uses: actions/[email protected]
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.197.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Set up Java

.github/workflows/deploy-production.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           ssh-key: ${{ secrets.RELEASE_SSH_KEY }}
       - name: Set up Ruby
-        uses: ruby/setup-ruby@v1.197.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Set up Java

.tool-versions

@@ -1 +1 @@
-ruby 3.2.3
+ruby 3.4.1

Gemfile

@@ -1,4 +1,12 @@
 source "https://rubygems.org"
 
-gem 'fastlane', "~> 2.225.0"
-gem "rexml", "~> 3.3.9"
+gem 'fastlane', "~> 2.226.0"
+gem "rexml", "~> 3.4.0"
+
+
+# Deps for fastlane
+# See https://github.com/fastlane/fastlane/issues/21942
+gem 'abbrev'
+gem 'logger'
+gem 'mutex_m'
+gem 'csv'

Gemfile.lock

@@ -5,25 +5,26 @@ GEM
       base64
       nkf
       rexml
+    abbrev (0.1.2)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.996.0)
-    aws-sdk-core (3.211.0)
+    aws-partitions (1.1037.0)
+    aws-sdk-core (3.215.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.95.0)
+    aws-sdk-kms (1.96.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.169.0)
+    aws-sdk-s3 (1.177.0)
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.10.1)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -32,6 +33,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.2)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
@@ -58,17 +60,17 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.3.1)
-    fastlane (2.225.0)
+    fastimage (2.4.0)
+    fastlane (2.226.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -108,7 +110,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
+      xcpretty (~> 0.4.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-sirp (1.0.0)
       sysrandom (~> 1.0)
@@ -150,34 +152,36 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.7)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.4)
-    jwt (2.9.3)
+    json (2.9.1)
+    jwt (2.10.1)
       base64
+    logger (1.6.4)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
+    mutex_m (0.3.0)
     nanaimo (0.4.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
-    plist (3.7.1)
+    plist (3.7.2)
     public_suffix (6.0.1)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.9)
-    rouge (2.0.7)
+    rexml (3.4.0)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     security (0.1.5)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -199,15 +203,15 @@ GEM
     uber (0.1.0)
     unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.26.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.0)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
@@ -217,8 +221,12 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  fastlane (~> 2.225.0)
-  rexml (~> 3.3.9)
+  abbrev
+  csv
+  fastlane (~> 2.226.0)
+  logger
+  mutex_m
+  rexml (~> 3.4.0)
 
 BUNDLED WITH
-   2.4.21
+   2.6.2

app/build.gradle.kts

@@ -23,8 +23,8 @@ android {
         applicationId = "com.capyreader.app"
         minSdk = 30
         targetSdk = 35
-        versionCode = 1090
-        versionName = "2025.01.1090-dev"
+        versionCode = 1096
+        versionName = "2025.01.1096-dev"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/AndroidManifest.xml

@@ -59,5 +59,11 @@
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="dataSync"
             tools:node="merge" />
+
+        <receiver android:name=".ArticleStatusBroadcastReceiver" android:exported="false">
+            <intent-filter>
+                <action android:name="com.capyreader.ACTION_DISMISS_NOTIFICATION" />
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>

app/src/main/java/com/capyreader/app/AccountModule.kt

@@ -1,6 +1,7 @@
 package com.capyreader.app
 
 import com.capyreader.app.common.AppPreferences
+import com.capyreader.app.notifications.NotificationHelper
 import com.jocmp.capy.Account
 import com.jocmp.capy.AccountManager
 import com.jocmp.capy.DatabaseProvider
@@ -17,4 +18,5 @@ val accountModule = module {
             database = get<Database>()
         )!!
     }
+    single<NotificationHelper> { NotificationHelper(account = get(), applicationContext = get()) }
 }

app/src/main/java/com/capyreader/app/ArticleStatusBroadcastReceiver.kt

@@ -0,0 +1,34 @@
+package com.capyreader.app
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.capyreader.app.notifications.NotificationHelper
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+class ArticleStatusBroadcastReceiver : BroadcastReceiver(), KoinComponent {
+    private val handler: BroadcastHandler by lazy { BroadcastHandler() }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        if (intent.action == ACTION_DISMISS_NOTIFICATION) {
+            val articleID = intent.getStringExtra(ARTICLE_ID) ?: return
+
+            handler.dismissNotification(articleID)
+        }
+    }
+
+    class BroadcastHandler : KoinComponent {
+        private val notificationHelper by inject<NotificationHelper>()
+
+        fun dismissNotification(articleID: String) {
+            notificationHelper.dismissNotifications(listOf(articleID))
+        }
+    }
+
+    companion object {
+        const val ACTION_DISMISS_NOTIFICATION = "com.capyreader.ACTION_DISMISS_NOTIFICATION"
+
+        const val ARTICLE_ID = "com.capyreader.articles.article_id"
+    }
+}

app/src/main/java/com/capyreader/app/MainActivity.kt

@@ -10,7 +10,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import com.capyreader.app.common.AppPreferences
-import com.capyreader.app.refresher.NotificationHelper
+import com.capyreader.app.notifications.NotificationHelper
 import com.capyreader.app.ui.App
 import com.capyreader.app.ui.Route
 import org.koin.android.ext.android.get

app/src/main/java/com/capyreader/app/common/AppPreferences.kt

@@ -76,7 +76,7 @@ class AppPreferences(context: Context) {
             get() = preferenceStore.getBoolean("article_pin_top_bar", true)
 
         val fontSize: Preference<Int>
-            get() = preferenceStore.getInt("article_font_size", FontSize.default)
+            get() = preferenceStore.getInt("article_font_size", FontSize.DEFAULT)
 
         val fontFamily: Preference<FontOption>
             get() = preferenceStore.getEnum("article_font_family", FontOption.default)

app/src/main/java/com/capyreader/app/notifications/DeleteNotificationWorker.kt

@@ -0,0 +1,45 @@
+package com.capyreader.app.notifications
+
+import android.content.Context
+import androidx.work.CoroutineWorker
+import androidx.work.Data
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.OutOfQuotaPolicy
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+class DeleteNotificationWorker(
+    appContext: Context,
+    workerParams: WorkerParameters
+) : CoroutineWorker(appContext, workerParams), KoinComponent {
+    private val notificationHelper by inject<NotificationHelper>()
+
+    override suspend fun doWork(): Result {
+        val notificationID = inputData.getString(ARTICLE_ID) ?: return Result.failure()
+
+        notificationHelper.dismissNotifications(listOf(notificationID))
+
+        return Result.success()
+    }
+
+    companion object {
+        const val ARTICLE_ID = "article_notification_id"
+
+        fun performAsync(articleID: String, context: Context) {
+            val workManager = WorkManager.getInstance(context)
+            val data = Data
+                .Builder()
+                .putString(ARTICLE_ID, articleID)
+                .build()
+
+            val request = OneTimeWorkRequestBuilder<DeleteNotificationWorker>()
+                .setInputData(data)
+                .setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                .build()
+
+            workManager.enqueue(request)
+        }
+    }
+}