Update translations from Weblate

.github/workflows/ci.yml

@@ -18,9 +18,12 @@ jobs:
         distribution: temurin
 
     - name: Clone Flutter SDK
-      # TODO(#1204) reinstate shallow clone with --depth=1000 and its corresponding comment here
+      # We can't do a depth-1 clone, because we need the most recent tag
+      # so that Flutter knows its version and sees the constraint in our
+      # pubspec is satisfied.  It's uncommon for flutter/flutter to go
+      # more than 100 commits between tags.  Fetch 1000 for good measure.
       run: |
-        git clone -b main https://github.com/flutter/flutter ~/flutter
+        git clone --depth=1000 -b main https://github.com/flutter/flutter ~/flutter
         TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
         echo ~/flutter/bin >> "$GITHUB_PATH"
 

.github/workflows/update-translations.yml

@@ -1,22 +1,56 @@
 name: Update translations from Weblate
+permissions:
+  contents: write
+  pull-requests: write
 on:
+  pull_request:
   schedule:
     - cron: "0 10 * * 1"
   workflow_dispatch:
+
 jobs:
   update-translations:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
       - name: Fetch and merge from Weblate
         # The commit message is generated in Weblate; see https://hosted.weblate.org/addon/17163/
         run: |
+          git checkout -b main
+          git log --oneline --graph --all -n5
           git remote add weblate https://hosted.weblate.org/git/zulip/zulip-flutter/
           git fetch weblate
-          git merge --ff-only weblate/main
+          GIT_COMMITTER_NAME="Hosted Weblate" GIT_COMMITTER_EMAIL="[email protected]" \
+            git cherry-pick weblate/main ^HEAD
+
+      - name: Clone Flutter SDK
+        # TODO(#1204) reinstate shallow clone with --depth=1000 and its corresponding comment here
+        run: |
+          git clone -b main https://github.com/flutter/flutter ~/flutter
+          TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
+          echo ~/flutter/bin >> "$GITHUB_PATH"
+
+          # The Flutter tool assumes the tip of tree is "origin/master"
+          # (or "upstream/master"):
+          #   https://github.com/flutter/flutter/issues/160626
+          # TODO(upstream): make workaround unneeded
+          git --git-dir ~/flutter/.git update-ref refs/remotes/origin/master origin/main
+
+      - name: Update generated code
+        run: |
+          mkdir -p build
+          tools/check l10n --fix
+          git add lib/generated/l10n/
+          GIT_COMMITTER_NAME="Hosted Weblate" GIT_COMMITTER_EMAIL="[email protected]" \
+            git commit --amend -C HEAD
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
         with:
           branch: update-translations/weblate
           delete-branch: true
           title: Update translations from Weblate
+          base: ${{ github.head_ref }}

android/app/src/main/kotlin/com/zulip/flutter/Notifications.g.kt

@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v20.0.2), do not edit directly.
+// Autogenerated from Pigeon (v22.7.2), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 @file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
 
@@ -7,7 +7,9 @@ package com.zulip.flutter
 import android.util.Log
 import io.flutter.plugin.common.BasicMessageChannel
 import io.flutter.plugin.common.BinaryMessenger
+import io.flutter.plugin.common.EventChannel
 import io.flutter.plugin.common.MessageCodec
+import io.flutter.plugin.common.StandardMethodCodec
 import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
@@ -64,17 +66,16 @@ data class NotificationChannel (
   val lightsEnabled: Boolean? = null,
   val soundUrl: String? = null,
   val vibrationPattern: LongArray? = null
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): NotificationChannel {
-      val id = __pigeon_list[0] as String
-      val importance = __pigeon_list[1].let { num -> if (num is Int) num.toLong() else num as Long }
-      val name = __pigeon_list[2] as String?
-      val lightsEnabled = __pigeon_list[3] as Boolean?
-      val soundUrl = __pigeon_list[4] as String?
-      val vibrationPattern = __pigeon_list[5] as LongArray?
+    fun fromList(pigeonVar_list: List<Any?>): NotificationChannel {
+      val id = pigeonVar_list[0] as String
+      val importance = pigeonVar_list[1] as Long
+      val name = pigeonVar_list[2] as String?
+      val lightsEnabled = pigeonVar_list[3] as Boolean?
+      val soundUrl = pigeonVar_list[4] as String?
+      val vibrationPattern = pigeonVar_list[5] as LongArray?
       return NotificationChannel(id, importance, name, lightsEnabled, soundUrl, vibrationPattern)
     }
   }
@@ -104,14 +105,13 @@ data class AndroidIntent (
   val dataUrl: String,
   /** A combination of flags from [IntentFlag]. */
   val flags: Long
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): AndroidIntent {
-      val action = __pigeon_list[0] as String
-      val dataUrl = __pigeon_list[1] as String
-      val flags = __pigeon_list[2].let { num -> if (num is Int) num.toLong() else num as Long }
+    fun fromList(pigeonVar_list: List<Any?>): AndroidIntent {
+      val action = pigeonVar_list[0] as String
+      val dataUrl = pigeonVar_list[1] as String
+      val flags = pigeonVar_list[2] as Long
       return AndroidIntent(action, dataUrl, flags)
     }
   }
@@ -139,14 +139,13 @@ data class PendingIntent (
    * with `Intent`; see Android docs for `PendingIntent.getActivity`.
    */
   val flags: Long
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): PendingIntent {
-      val requestCode = __pigeon_list[0].let { num -> if (num is Int) num.toLong() else num as Long }
-      val intent = __pigeon_list[1] as AndroidIntent
-      val flags = __pigeon_list[2].let { num -> if (num is Int) num.toLong() else num as Long }
+    fun fromList(pigeonVar_list: List<Any?>): PendingIntent {
+      val requestCode = pigeonVar_list[0] as Long
+      val intent = pigeonVar_list[1] as AndroidIntent
+      val flags = pigeonVar_list[2] as Long
       return PendingIntent(requestCode, intent, flags)
     }
   }
@@ -168,12 +167,11 @@ data class PendingIntent (
  */
 data class InboxStyle (
   val summaryText: String
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): InboxStyle {
-      val summaryText = __pigeon_list[0] as String
+    fun fromList(pigeonVar_list: List<Any?>): InboxStyle {
+      val summaryText = pigeonVar_list[0] as String
       return InboxStyle(summaryText)
     }
   }
@@ -205,14 +203,13 @@ data class Person (
   val iconBitmap: ByteArray? = null,
   val key: String,
   val name: String
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): Person {
-      val iconBitmap = __pigeon_list[0] as ByteArray?
-      val key = __pigeon_list[1] as String
-      val name = __pigeon_list[2] as String
+    fun fromList(pigeonVar_list: List<Any?>): Person {
+      val iconBitmap = pigeonVar_list[0] as ByteArray?
+      val key = pigeonVar_list[1] as String
+      val name = pigeonVar_list[2] as String
       return Person(iconBitmap, key, name)
     }
   }
@@ -236,14 +233,13 @@ data class MessagingStyleMessage (
   val text: String,
   val timestampMs: Long,
   val person: Person
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): MessagingStyleMessage {
-      val text = __pigeon_list[0] as String
-      val timestampMs = __pigeon_list[1].let { num -> if (num is Int) num.toLong() else num as Long }
-      val person = __pigeon_list[2] as Person
+    fun fromList(pigeonVar_list: List<Any?>): MessagingStyleMessage {
+      val text = pigeonVar_list[0] as String
+      val timestampMs = pigeonVar_list[1] as Long
+      val person = pigeonVar_list[2] as Person
       return MessagingStyleMessage(text, timestampMs, person)
     }
   }
@@ -266,17 +262,16 @@ data class MessagingStyleMessage (
 data class MessagingStyle (
   val user: Person,
   val conversationTitle: String? = null,
-  val messages: List<MessagingStyleMessage?>,
+  val messages: List<MessagingStyleMessage>,
   val isGroupConversation: Boolean
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): MessagingStyle {
-      val user = __pigeon_list[0] as Person
-      val conversationTitle = __pigeon_list[1] as String?
-      val messages = __pigeon_list[2] as List<MessagingStyleMessage?>
-      val isGroupConversation = __pigeon_list[3] as Boolean
+    fun fromList(pigeonVar_list: List<Any?>): MessagingStyle {
+      val user = pigeonVar_list[0] as Person
+      val conversationTitle = pigeonVar_list[1] as String?
+      val messages = pigeonVar_list[2] as List<MessagingStyleMessage>
+      val isGroupConversation = pigeonVar_list[3] as Boolean
       return MessagingStyle(user, conversationTitle, messages, isGroupConversation)
     }
   }
@@ -299,14 +294,13 @@ data class MessagingStyle (
  */
 data class Notification (
   val group: String,
-  val extras: Map<String?, String?>
-
-) {
+  val extras: Map<String, String>
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): Notification {
-      val group = __pigeon_list[0] as String
-      val extras = __pigeon_list[1] as Map<String?, String?>
+    fun fromList(pigeonVar_list: List<Any?>): Notification {
+      val group = pigeonVar_list[0] as String
+      val extras = pigeonVar_list[1] as Map<String, String>
       return Notification(group, extras)
     }
   }
@@ -329,14 +323,13 @@ data class StatusBarNotification (
   val id: Long,
   val tag: String,
   val notification: Notification
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): StatusBarNotification {
-      val id = __pigeon_list[0].let { num -> if (num is Int) num.toLong() else num as Long }
-      val tag = __pigeon_list[1] as String
-      val notification = __pigeon_list[2] as Notification
+    fun fromList(pigeonVar_list: List<Any?>): StatusBarNotification {
+      val id = pigeonVar_list[0] as Long
+      val tag = pigeonVar_list[1] as String
+      val notification = pigeonVar_list[2] as Notification
       return StatusBarNotification(id, tag, notification)
     }
   }
@@ -370,14 +363,13 @@ data class StoredNotificationSound (
   val isOwned: Boolean,
   /** A `content://…` URL pointing to the sound file. */
   val contentUrl: String
-
-) {
+)
+ {
   companion object {
-    @Suppress("LocalVariableName")
-    fun fromList(__pigeon_list: List<Any?>): StoredNotificationSound {
-      val fileName = __pigeon_list[0] as String
-      val isOwned = __pigeon_list[1] as Boolean
-      val contentUrl = __pigeon_list[2] as String
+    fun fromList(pigeonVar_list: List<Any?>): StoredNotificationSound {
+      val fileName = pigeonVar_list[0] as String
+      val isOwned = pigeonVar_list[1] as Boolean
+      val contentUrl = pigeonVar_list[2] as String
       return StoredNotificationSound(fileName, isOwned, contentUrl)
     }
   }
@@ -389,7 +381,7 @@ data class StoredNotificationSound (
     )
   }
 }
-private object NotificationsPigeonCodec : StandardMessageCodec() {
+private open class NotificationsPigeonCodec : StandardMessageCodec() {
   override fun readValueOfType(type: Byte, buffer: ByteBuffer): Any? {
     return when (type) {
       129.toByte() -> {
@@ -561,7 +553,7 @@ interface AndroidNotificationHostApi {
    *   https://developer.android.com/reference/kotlin/android/app/NotificationManager.html#notify
    *   https://developer.android.com/reference/androidx/core/app/NotificationCompat.Builder
    */
-  fun notify(tag: String?, id: Long, autoCancel: Boolean?, channelId: String, color: Long?, contentIntent: PendingIntent?, contentText: String?, contentTitle: String?, extras: Map<String?, String?>?, groupKey: String?, inboxStyle: InboxStyle?, isGroupSummary: Boolean?, messagingStyle: MessagingStyle?, number: Long?, smallIconResourceName: String?)
+  fun notify(tag: String?, id: Long, autoCancel: Boolean?, channelId: String, color: Long?, contentIntent: PendingIntent?, contentText: String?, contentTitle: String?, extras: Map<String, String>?, groupKey: String?, inboxStyle: InboxStyle?, isGroupSummary: Boolean?, messagingStyle: MessagingStyle?, number: Long?, smallIconResourceName: String?)
   /**
    * Wraps `androidx.core.app.NotificationManagerCompat.getActiveNotifications`,
    * combined with `androidx.core.app.NotificationCompat.MessagingStyle.extractMessagingStyleFromNotification`.
@@ -597,7 +589,7 @@ interface AndroidNotificationHostApi {
   companion object {
     /** The codec used by AndroidNotificationHostApi. */
     val codec: MessageCodec<Any?> by lazy {
-      NotificationsPigeonCodec
+      NotificationsPigeonCodec()
     }
     /** Sets up an instance of `AndroidNotificationHostApi` to handle messages through the `binaryMessenger`. */
     @JvmOverloads
@@ -693,19 +685,19 @@ interface AndroidNotificationHostApi {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
             val tagArg = args[0] as String?
-            val idArg = args[1].let { num -> if (num is Int) num.toLong() else num as Long }
+            val idArg = args[1] as Long
             val autoCancelArg = args[2] as Boolean?
             val channelIdArg = args[3] as String
-            val colorArg = args[4].let { num -> if (num is Int) num.toLong() else num as Long? }
+            val colorArg = args[4] as Long?
             val contentIntentArg = args[5] as PendingIntent?
             val contentTextArg = args[6] as String?
             val contentTitleArg = args[7] as String?
-            val extrasArg = args[8] as Map<String?, String?>?
+            val extrasArg = args[8] as Map<String, String>?
             val groupKeyArg = args[9] as String?
             val inboxStyleArg = args[10] as InboxStyle?
             val isGroupSummaryArg = args[11] as Boolean?
             val messagingStyleArg = args[12] as MessagingStyle?
-            val numberArg = args[13].let { num -> if (num is Int) num.toLong() else num as Long? }
+            val numberArg = args[13] as Long?
             val smallIconResourceNameArg = args[14] as String?
             val wrapped: List<Any?> = try {
               api.notify(tagArg, idArg, autoCancelArg, channelIdArg, colorArg, contentIntentArg, contentTextArg, contentTitleArg, extrasArg, groupKeyArg, inboxStyleArg, isGroupSummaryArg, messagingStyleArg, numberArg, smallIconResourceNameArg)
@@ -759,7 +751,7 @@ interface AndroidNotificationHostApi {
           channel.setMessageHandler { message, reply ->
             val args = message as List<Any?>
             val tagArg = args[0] as String?
-            val idArg = args[1].let { num -> if (num is Int) num.toLong() else num as Long }
+            val idArg = args[1] as Long
             val wrapped: List<Any?> = try {
               api.cancel(tagArg, idArg)
               listOf(null)