Update translations from Weblate

.github/workflows/ci.yml

@@ -22,8 +22,12 @@ jobs:
       # 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.
+      # TODO(upstream): Around 2025-05, Flutter upstream stopped making
+      #   tags within the main/master branch.  Get that fixed:
+      #     https://github.com/zulip/zulip-flutter/issues/1710
+      #   Pending that, fetch more than 1000 commits.
       run: |
-        git clone --depth=1000 -b main https://github.com/flutter/flutter ~/flutter
+        git clone --depth=3000 -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,19 +1,54 @@
 name: Update translations from Weblate
+permissions:
+  contents: write
+  pull-requests: write
 on:
   schedule:
     - cron: "0 10 * * 1"
   workflow_dispatch:
+
 jobs:
   update-translations:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - name: Fetch and merge from Weblate
         # The commit message is generated in Weblate; see https://hosted.weblate.org/addon/17163/
         run: |
           git remote add weblate https://hosted.weblate.org/git/zulip/zulip-flutter/
           git fetch weblate
-          git merge --ff-only weblate/main
+          # This may lag behind `main` if weblate is backlogged; this can
+          # theoretically cause the PR to not be able to auto-merged, though
+          # re-running the action once weblate has caught up should be
+          # sufficient to fix that.
+          git reset --hard weblate/main
+
+      - name: Clone Flutter SDK
+        # 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.
+        # TODO(upstream): See ci.yml for why we fetch more than 1000.
+        run: |
+          git clone --depth=3000 -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:

.mailmap

@@ -12,11 +12,16 @@
 #     # shows raw names/emails, filtered by mapped name:
 #   $ git log --format='%an %ae' --author=$NAME | uniq -c
 
+Brynly Mitchell <[email protected]>
+Chinmay Ajith <[email protected]>
 Chris Bobbe <[email protected]> <[email protected]>
 Greg Price <[email protected]> <[email protected]>
+K Akhil <[email protected]>
+Lakshya Goel <[email protected]>
 Lalit Kumar Singh <[email protected]>
-Rajesh Malviya <[email protected]>
+Rajesh Malviya <[email protected]> <[email protected]>
 Shu Chen <[email protected]> <[email protected]>
+Tomlin7 <[email protected]>
 
 # The goal when editing this file is to group all of a given person's
 # contributions together, and under their preferred name and email

README.md

@@ -1,36 +1,36 @@
-# Zulip Flutter (beta)
+# Zulip Flutter
 
-A Zulip client for Android and iOS, using Flutter.
+The official Zulip app for Android and iOS, built with Flutter.
 
-This app is currently [in beta][beta].
-When it's ready, it [will become the new][] official mobile Zulip client.
-To see what work is planned before that launch,
-see the [milestones][] and the [project board][].
-
-[beta]: https://chat.zulip.org/#narrow/stream/2-general/topic/Flutter/near/1708728
-[will become the new]: https://chat.zulip.org/#narrow/stream/2-general/topic/Flutter/near/1582367
-[milestones]: https://github.com/zulip/zulip-flutter/milestones?direction=asc&sort=title
-[project board]: https://github.com/orgs/zulip/projects/5/views/4
+This app [was launched][] as the main Zulip mobile app
+in June 2025.
+It replaced the [previous Zulip mobile app][] built with React Native.
 
+[was launched]: https://blog.zulip.com/flutter-mobile-app-launch
+[previous Zulip mobile app]: https://github.com/zulip/zulip-mobile#readme
 
-## Using Zulip
 
-To use Zulip on iOS or Android, install the [official mobile Zulip client][].
+## Get the app
 
-You can also [try out this beta app][beta].
-
-[official mobile Zulip client]: https://github.com/zulip/zulip-mobile#readme
+Release versions of the app are available here:
+* [Zulip for iOS](https://apps.apple.com/app/zulip/id1203036395)
+  on Apple's App Store
+* [Zulip for Android](https://play.google.com/store/apps/details?id=com.zulipmobile)
+  on the Google Play Store
+  * Or if you don't use Google Play, you can
+    [download an APK](https://github.com/zulip/zulip-flutter/releases/latest)
+    from the official build we post on GitHub.
 
 
 ## Contributing
 
 Contributions to this app are welcome.
 
 If you're looking to participate in Google Summer of Code with Zulip,
-this is one of the projects we're [accepting GSoC 2024 applications][]
-for.
+this was among the projects we accepted [GSoC applications][gsoc] for
+in 2024 and 2025.
 
-[accepting GSoC 2024 applications]: https://zulip.readthedocs.io/en/latest/outreach/gsoc.html#mobile-app
+[gsoc]: https://zulip.readthedocs.io/en/latest/outreach/gsoc.html#mobile-app
 
 
 ### Picking an issue to work on
@@ -42,7 +42,7 @@ browsing through recent commits and the codebase,
 and the Zulip guide to Git.
 
 To find possible issues to work on, see our [project board][].
-Look for issues up through the "Launch" milestone,
+Look for issues in the earliest milestone,
 and that aren't already assigned.
 
 Follow the Zulip guide to [picking an issue to work on][],
@@ -55,6 +55,7 @@ and describing your progress.
 
 [your first codebase contribution]: https://zulip.readthedocs.io/en/latest/contributing/contributing.html#your-first-codebase-contribution
 [what makes a great Zulip contributor]: https://zulip.readthedocs.io/en/latest/contributing/contributing.html#what-makes-a-great-zulip-contributor
+[project board]: https://github.com/orgs/zulip/projects/5/views/4
 [picking an issue to work on]: https://zulip.readthedocs.io/en/latest/contributing/contributing.html#picking-an-issue-to-work-on
 
 
@@ -96,6 +97,8 @@ Two specific points to expand on:
  * Your changes will need to be organized into
    [clear and coherent commits][commit-style],
    following [Zulip's commit style guide][commit-style].
+   (Use Greg's ["secret" to using `git log -p`][git-log-p-secret]
+   and/or a graphical Git client to see examples of mergeable commits.)
 
    This is always required before we can merge your PR.  Depending on
    your changes' complexity, it may also be required before we can
@@ -106,9 +109,10 @@ Two specific points to expand on:
 [working on an issue]: https://zulip.readthedocs.io/en/latest/contributing/contributing.html#working-on-an-issue
 [submitting a pull request]: https://zulip.readthedocs.io/en/latest/contributing/review-process.html
 [commit-style]: https://zulip.readthedocs.io/en/latest/contributing/commit-discipline.html
+[git-log-p-secret]: https://github.com/zulip/zulip-mobile/blob/main/docs/howto/git.md#git-log-secret
 
 
-## Getting started in developing this beta app
+## Getting started in developing
 
 ### Setting up
 
@@ -289,7 +293,7 @@ good time to [report them as issues][dart-test-tracker].
 
 #### Server compatibility
 
-We support Zulip Server 4.0 and later.
+We support Zulip Server 7.0 and later.
 
 For API features added in newer versions, use `TODO(server-N)`
 comments (like those you see in the existing code.)

android/app/build.gradle

@@ -29,16 +29,12 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
-        applicationId "com.zulip.flutter"
+        applicationId "com.zulipmobile"
         minSdkVersion 28
         targetSdkVersion flutter.targetSdkVersion
         // These are synced to local.properties from pubspec.yaml by the flutter tool.
@@ -77,17 +73,25 @@ android {
         //   https://developer.android.com/reference/tools/gradle-api/8.5/com/android/build/api/dsl/Lint
         checkAllWarnings = true
         warningsAsErrors = true
+        baseline = file("lint-baseline.xml")
+        disable += ['AndroidGradlePluginVersion']
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
     }
 }
 
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile).configureEach {
     // Compile Kotlin with `-Werror`... but only in release builds, so that it
     // doesn't get in the way of quick local experiments for debugging.
     //
     // The string-searching makes this a bit of a mess, but it works.
     // Better would be if we can add this to android.buildTypes.release above;
     // but on a first attempt that didn't work (it affected debug builds too).
-    kotlinOptions.allWarningsAsErrors = name.contains("Release")
+    compilerOptions.allWarningsAsErrors = name.contains("Release")
 }
 
 flutter {

android/app/lint-baseline.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 8.10.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.10.0)" variant="all" version="8.10.0">
+
+    <!--TODO(#855) see if this is no longer needed-->
+    <issue
+        id="InvalidPackage"
+        message="Invalid package reference in library; not included in Android: `javax.xml.stream`. Referenced from `org.apache.tika.utils.XMLReaderUtils`.">
+        <location
+            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.apache.tika/tika-core/3.2.0/9232bb3c71f231e8228f570071c0e1ea29d40115/tika-core-3.2.0.jar"/>
+    </issue>
+
+</issues>

android/app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-permission android:name="android.permission.INTERNET"/>
    <application
-        android:label="Zulip beta"
+        android:label="Zulip"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -36,6 +36,16 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data android:scheme="zulip" android:host="login" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

android/app/src/main/kotlin/com/zulip/flutter/AndroidIntentEventListener.kt

@@ -0,0 +1,112 @@
+package com.zulip.flutter
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.OpenableColumns
+
+class AndroidIntentEventListener : AndroidIntentEventsStreamHandler() {
+  private var eventSink: PigeonEventSink<AndroidIntentEvent>? = null
+  private val buffer = mutableListOf<AndroidIntentEvent>()
+
+  override fun onListen(p0: Any?, sink: PigeonEventSink<AndroidIntentEvent>) {
+    eventSink = sink
+    buffer.forEach { eventSink!!.success(it) }
+  }
+
+  private fun onEvent(event: AndroidIntentEvent) {
+    if (eventSink != null) {
+      eventSink?.success(event)
+    } else {
+      buffer.add(event)
+    }
+  }
+
+  fun handleSend(context: Context, intent: Intent) {
+    val intentAction = intent.action
+    assert(
+      intentAction == Intent.ACTION_SEND
+          || intentAction == Intent.ACTION_SEND_MULTIPLE
+    )
+
+    // EXTRA_TEXT and EXTRA_STREAM are the text and file components of the
+    // content, respectively. The ACTION_SEND{,_MULTIPLE} docs say
+    // "either" / "or" will be present:
+    //   https://developer.android.com/reference/android/content/Intent#ACTION_SEND
+    // But empirically both can be present, commonly, so we accept that form,
+    // interpreting it as an intent to share both kinds of data.
+    //
+    // Empirically, sometimes EXTRA_TEXT isn't something we think needs to be
+    // shared, like the URL of a file that's present in EXTRA_STREAM… but we
+    // shrug and include it anyway because we don't want to second-guess other
+    // apps' decisions about what to include; it's their responsibility.
+
+    val extraText = intent.getStringExtra(Intent.EXTRA_TEXT)
+    val extraStream = when (intentAction) {
+      Intent.ACTION_SEND -> {
+        var extraStream: List<IntentSharedFile>? = null
+        // TODO(android-sdk-33) Remove the use of deprecated API.
+        @Suppress("DEPRECATION") val url = intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)
+        if (url != null) {
+          extraStream = listOf(getIntentSharedFile(context, url))
+        }
+        extraStream
+      }
+
+      Intent.ACTION_SEND_MULTIPLE -> {
+        var extraStream: MutableList<IntentSharedFile>? = null
+        // TODO(android-sdk-33) Remove the use of deprecated API.
+        @Suppress("DEPRECATION") val urls =
+          intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)
+        if (urls != null) {
+          extraStream = mutableListOf()
+          for (url in urls) {
+            val sharedFile = getIntentSharedFile(context, url)
+            extraStream.add(sharedFile)
+          }
+        }
+        extraStream
+      }
+
+      else -> throw IllegalArgumentException("Unexpected value for intent.action: $intentAction")
+    }
+
+    if (extraText == null && extraStream == null) {
+      throw Exception("Got unexpected ACTION_SEND* intent, with neither EXTRA_TEXT nor EXTRA_STREAM")
+    }
+
+    onEvent(
+      AndroidIntentSendEvent(
+        action = intentAction,
+        extraText = extraText,
+        extraStream = extraStream,
+      )
+    )
+  }
+}
+
+// A helper function to retrieve the shared file from the `content://` URL
+// from the ACTION_SEND{_MULTIPLE} intent.
+fun getIntentSharedFile(context: Context, url: Uri): IntentSharedFile {
+  val contentResolver = context.contentResolver
+  val mimeType = contentResolver.getType(url)
+  val name = contentResolver.query(url, null, null, null, null)?.use { cursor ->
+    cursor.moveToFirst()
+    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+    cursor.getString(nameIndex)
+  }
+
+  class ResolverFailedException(msg: String) : RuntimeException(msg)
+
+  val bytes = (contentResolver.openInputStream(url)
+    ?: throw ResolverFailedException("resolver.open… failed"))
+    .use { inputStream ->
+      inputStream.readBytes()
+    }
+
+  return IntentSharedFile(
+    name = name,
+    mimeType = mimeType,
+    bytes = bytes
+  )
+}