From 1a9fd468717fdb161c8dc8bd156345de75630a34 Mon Sep 17 00:00:00 2001
From: Greg Price <greg@zulip.com>
Date: Mon, 8 Jul 2024 15:17:40 -0700
Subject: [PATCH 1/3] android: Cut unused network-security-config XML

This was introduced in cffb112fd / #474 because we thought it
would be a fix for #461.  As discussed on that issue thread,
though, it turns out this file doesn't have an effect on the
Dart HTTP implementation, which we use.

Since it looks like it's doing something but in fact it isn't,
cut it out to avoid confusion.  It'll still be there in the
Git history if we later want to use it as part of a future
effort to fix #461.
---
 android/app/src/main/AndroidManifest.xml      |  1 -
 .../main/res/xml/network_security_config.xml  | 29 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 android/app/src/main/res/xml/network_security_config.xml

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index b65a33a68a..a0f602e899 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
             android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:networkSecurityConfig="@xml/network_security_config"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
diff --git a/android/app/src/main/res/xml/network_security_config.xml b/android/app/src/main/res/xml/network_security_config.xml
deleted file mode 100644
index 5dd42541df..0000000000
--- a/android/app/src/main/res/xml/network_security_config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <!-- For reference on this file's semantics:
-           https://developer.android.com/training/articles/security-config#FileFormat -->
-    <base-config>
-        <!-- If the user has configured additional CAs on the device, trust those
-             too.  This can be useful for an internal Zulip server in a corporate
-             or institutional environment, and was a recurring user request:
-               https://github.com/zulip/zulip-mobile/issues/3312
-               https://github.com/zulip/zulip-flutter/issues/461 -->
-        <trust-anchors>
-            <certificates src="system" />
-            <certificates src="user" />
-        </trust-anchors>
-    </base-config>
-    <domain-config>
-        <!-- But revert to the default, stricter behavior — trusting only the
-             system CA list — where we know we can, which means for domains where
-             we know a legitimate cert will always come from a widely-trusted CA.
-             Specifically, we know this is the case for Zulip Cloud and other
-             domains operated by the core Zulip developers at Kandra Labs. -->
-        <domain includeSubdomains="true">zulipchat.com</domain>
-        <domain includeSubdomains="true">zulip.com</domain>
-        <domain includeSubdomains="true">zulip.org</domain>
-        <trust-anchors>
-            <certificates src="system" />
-        </trust-anchors>
-    </domain-config>
-</network-security-config>

From 8cbaf3697810d2d34638924477eff230d0c09beb Mon Sep 17 00:00:00 2001
From: Greg Price <greg@zulip.com>
Date: Mon, 8 Jul 2024 15:30:50 -0700
Subject: [PATCH 2/3] android [nfc]: Merge drawable-v21/ into drawable/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our minSdkVersion is no less than 21 -- in fact it's 28 -- so the
app only ever runs on devices that will pick the v21 version over
the baseline version.  So simplify that variation away.

This may break local Android builds in an existing worktree;
it seems like the Android Gradle Plugin is inappropriately caching
where it expects to find this file and gets confused when that copy
goes missing.  The error looks like this:

    * What went wrong:
    Execution failed for task ':app:processDebugResources'.
    > A failure occurred while executing com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask$TaskAction
       > Android resource linking failed
         com.zulip.flutter.app-mergeDebugResources-32:/values/values.xml:213: error: resource drawable/launch_background (aka com.zulip.flutter:drawable/launch_background) not found.
         […]

To fix, clear the relevant cached data by running:

  $ tools/gradle -q --rerun-tasks \
      :app:bundleDebugResources :app:bundleReleaseResources
---
 .../src/main/res/drawable-v21/launch_background.xml  | 12 ------------
 .../app/src/main/res/drawable/launch_background.xml  |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml

diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
deleted file mode 100644
index f74085f3f6..0000000000
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
-</layer-list>
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 304732f884..f74085f3f6 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+    <item android:drawable="?android:colorBackground" />
 
     <!-- You can insert your own image assets here -->
     <!-- <item>

From ba829c691a4b17f9e9cb0f8c462a8d4813f418c5 Mon Sep 17 00:00:00 2001
From: Greg Price <greg@zulip.com>
Date: Mon, 8 Jul 2024 15:57:23 -0700
Subject: [PATCH 3/3] check: Run Android linter in android suite

---
 android/app/build.gradle | 7 +++++++
 tools/check              | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 529221630b..dd4178c4e9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -72,6 +72,13 @@ android {
                     signingConfigs.release : signingConfigs.debug
         }
     }
+
+    lint {
+        // For docs on options available here:
+        //   https://developer.android.com/reference/tools/gradle-api/8.5/com/android/build/api/dsl/Lint
+        checkAllWarnings = true
+        warningsAsErrors = true
+    }
 }
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
diff --git a/tools/check b/tools/check
index 3acb65a725..48ea5615ab 100755
--- a/tools/check
+++ b/tools/check
@@ -362,6 +362,15 @@ run_android() {
     files_check android/ \
     || return 0
 
+    # This causes `android/gradlew` to exist, for `tools/gradle` to use.
+    flutter build apk --config-only \
+    || return
+
+    # For docs on this Android linter:
+    #   https://developer.android.com/studio/write/lint
+    tools/gradle -q :app:lint \
+    || return
+
     flutter build apk \
     || return