From e7f1d5940d5f33b79f755dd0b9ef33589c924a56 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 16 Feb 2026 12:55:51 -0800
Subject: [PATCH 1/6] Fix Authentication

---
 .../java/org/cssnr/zipline/api/ServerApi.kt   | 25 +++++++++++++++++--
 .../zipline/ui/dialogs/UploadOptionsDialog.kt |  1 +
 .../zipline/ui/settings/SettingsFragment.kt   |  3 ++-
 app/src/main/res/layout/fragment_login.xml    |  1 -
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt b/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
index 390e2de..5a9e910 100644
--- a/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
+++ b/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
@@ -8,7 +8,10 @@ import android.webkit.CookieManager
 import androidx.core.content.edit
 import androidx.preference.PreferenceManager
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import okhttp3.Cookie
 import okhttp3.CookieJar
@@ -39,6 +42,7 @@ import retrofit2.http.Part
 import retrofit2.http.Path
 import retrofit2.http.Query
 import java.io.InputStream
+import java.lang.reflect.Type
 import java.net.URLConnection
 
 class ServerApi(private val context: Context, url: String? = null) {
@@ -69,7 +73,8 @@ class ServerApi(private val context: Context, url: String? = null) {
         Log.d("Api[login]", "$user - $pass - $code")
 
         return try {
-            val loginResponse = api.postAuthLogin(LoginRequest(user, pass, code))
+            val codeValue = if (code.isNullOrBlank()) null else code
+            val loginResponse = api.postAuthLogin(LoginRequest(user, pass, codeValue))
             Log.i("Api[login]", "loginResponse.code(): ${loginResponse.code()}")
             if (loginResponse.isSuccessful) {
                 val rawJson = loginResponse.body()?.string()
@@ -843,7 +848,9 @@ data class ErrorResponse(val error: String)
 
 fun Response<*>.parseErrorBody(context: Context): String? {
     val errorBody = errorBody() ?: return null
-    val moshi = Moshi.Builder().build()
+    val moshi = Moshi.Builder()
+        .add(SkipNullsAdapterFactory())
+        .build()
     val adapter = moshi.adapter(ErrorResponse::class.java)
     return errorBody.source().use { source ->
         try {
@@ -856,6 +863,20 @@ fun Response<*>.parseErrorBody(context: Context): String? {
     }
 }
 
+class SkipNullsAdapterFactory : JsonAdapter.Factory {
+    override fun create(type: Type, annotations: Set<Annotation>, moshi: Moshi): JsonAdapter<*> {
+        val delegate = moshi.nextAdapter<Any>(this, type, annotations)
+        return object : JsonAdapter<Any>() {
+            override fun fromJson(reader: JsonReader): Any? = delegate.fromJson(reader)
+
+            override fun toJson(writer: JsonWriter, value: Any?) {
+                writer.serializeNulls = false
+                delegate.toJson(writer, value)
+            }
+        }
+    }
+}
+
 
 class InputStreamRequestBody(
     private val contentType: MediaType,
diff --git a/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt b/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt
index 9709bb0..ccbc283 100644
--- a/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt
+++ b/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt
@@ -34,6 +34,7 @@ class UploadOptionsDialog : DialogFragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        @Suppress("DEPRECATION")
         uploadOptions = arguments?.getParcelable("upload_options")
     }
 
diff --git a/app/src/main/java/org/cssnr/zipline/ui/settings/SettingsFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/settings/SettingsFragment.kt
index 13173d3..9630457 100644
--- a/app/src/main/java/org/cssnr/zipline/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/cssnr/zipline/ui/settings/SettingsFragment.kt
@@ -14,6 +14,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.edit
+import androidx.core.content.pm.PackageInfoCompat
 import androidx.core.net.toUri
 import androidx.fragment.app.setFragmentResultListener
 import androidx.lifecycle.lifecycleScope
@@ -386,7 +387,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         val formattedVersion = getString(
             R.string.version_code_string,
             packageInfo.versionName,
-            packageInfo.versionCode.toString()
+            PackageInfoCompat.getLongVersionCode(packageInfo).toString()
         )
         Log.d("showAppInfoDialog", "formattedVersion: $formattedVersion")
 
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index f375f8b..79af110 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -113,7 +113,6 @@
             android:maxLength="6"
             android:drawableEnd="@drawable/md_password_2_24px"
             android:drawableTint="?android:attr/textColorTertiary"
-            android:visibility="gone"
             tools:visibility="visible" />
     </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>

From b2c1aa6a178393e994f1f1fdd4f91af6df4697ab Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 16 Feb 2026 13:40:16 -0800
Subject: [PATCH 2/6] Update Workflows

---
 .github/actionlint.yaml        |  6 +++++
 .github/workflows/draft.yaml   |  2 +-
 .github/workflows/lint.yaml    | 48 ++++++++++++++++++----------------
 .github/workflows/release.yaml | 20 +++++++-------
 .github/yamllint.yaml          |  7 +++++
 README.md                      | 34 +++++++++++++-----------
 Taskfile.yml                   | 24 +++++++++++++++++
 7 files changed, 92 insertions(+), 49 deletions(-)
 create mode 100644 .github/actionlint.yaml
 create mode 100644 .github/yamllint.yaml
 create mode 100644 Taskfile.yml

diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
new file mode 100644
index 0000000..447aaa1
--- /dev/null
+++ b/.github/actionlint.yaml
@@ -0,0 +1,6 @@
+paths:
+  .github/workflows/**/*.{yml,yaml}:
+    ignore:
+      - '"inputs" section is alias node but mapping node is expected'
+      - '"paths" section must be sequence node but got alias node with "" tag'
+      - '"paths-ignore" section must be sequence node but got alias node with "" tag'
diff --git a/.github/workflows/draft.yaml b/.github/workflows/draft.yaml
index a82f5c3..309c3b9 100644
--- a/.github/workflows/draft.yaml
+++ b/.github/workflows/draft.yaml
@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Draft Release Action"
         id: draft
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index c7f5bf3..35b316a 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -20,13 +20,19 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Debug event.json"
-        if: ${{ !cancelled() }}
         continue-on-error: true
-        run: |
-          cat "${GITHUB_EVENT_PATH}"
+        run: cat "${GITHUB_EVENT_PATH}"
+      - name: "Debug CTX github"
+        continue-on-error: true
+        env:
+          GITHUB_CTX: ${{ toJSON(github) }}
+        run: echo "$GITHUB_CTX"
+      - name: "Debug Environment"
+        continue-on-error: true
+        run: env
 
       - name: "Kotlin Lint"
         if: ${{ !cancelled() }}
@@ -49,28 +55,26 @@ jobs:
           echo "::endgroup::"
           npx prettier --check .
 
-      - name: "Yamllint"
+      - name: "yamllint"
         if: ${{ !cancelled() }}
         env:
-          CONFIG: "{extends: relaxed, ignore: [node_modules/,.github/disabled/], rules: {line-length: {max: 119}}}"
+          CONFIG: .github/yamllint.yaml
         run: |
           echo "::group::List Files"
-          yamllint -d '${{ env.CONFIG }}' --list-files .
+          yamllint -c "${{ env.CONFIG }}" --list-files .
           echo "::endgroup::"
-          yamllint -d '${{ env.CONFIG }}' .
+          yamllint -c "${{ env.CONFIG }}" .
 
-      - name: "Actionlint"
+      - name: "actionlint"
         if: ${{ !cancelled() }}
-        run: |
-          echo "::group::Download"
-          loc=$(curl -sI https://github.com/rhysd/actionlint/releases/latest | grep -i '^location:')
-          echo "loc: ${loc}"
-          tag=$(echo "${loc}" | sed -E 's|.*/tag/v?(.*)|\1|' | tr -d '\t\r\n')
-          echo "tag: ${tag}"
-          url="https://github.com/rhysd/actionlint/releases/latest/download/actionlint_${tag}_linux_amd64.tar.gz"
-          echo "url: ${url}"
-          curl -sL "${url}" | tar xz -C "${RUNNER_TEMP}" actionlint
-          file "${RUNNER_TEMP}/actionlint"
-          "${RUNNER_TEMP}/actionlint" --version
-          echo "::endgroup::"
-          "${RUNNER_TEMP}/actionlint" -color -verbose -shellcheck= -pyflakes=
+        uses: cssnr/actionlint-action@v1
+        with:
+          shellcheck_opts: -e SC2129
+
+      - name: "ShellCheck"
+        if: ${{ !cancelled() }}
+        uses: ludeeus/action-shellcheck@master
+        env:
+          SHELLCHECK_OPTS: -x
+        with:
+          scandir: .github/scripts
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index b42aa1b..508aa77 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Debug Event"
         continue-on-error: true
@@ -68,7 +68,7 @@ jobs:
           echo "::endgroup::"
 
       - name: "Update Version"
-        uses: chkfung/android-version-actions@v1.2.2
+        uses: chkfung/android-version-actions@fcf89abef1c7afba2083146dcca0c6da4705ba4b # v1.2.3
         id: version
         with:
           gradlePath: ${{ env.gradle_file }}
@@ -98,7 +98,7 @@ jobs:
           echo ${{ secrets.ANDROID_KEYSTORE_PASS }} | keytool -list -keystore ${{ env.key_file }}
 
       - name: "Setup Node 22"
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 22
 
@@ -114,7 +114,7 @@ jobs:
           ls -lAh app
 
       - name: "Setup Java"
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: "zulu"
           java-version: "17"
@@ -159,12 +159,10 @@ jobs:
 
       - name: "Upload APK to Release"
         if: ${{ github.event_name == 'release' }}
-        uses: svenstaro/upload-release-action@v2
+        uses: cssnr/upload-release-action@v1
         with:
-          file: ${{ env.apk_path }}/${{ env.signed_apk }}
-          tag: ${{ github.ref }}
+          files: ${{ env.apk_path }}/${{ env.signed_apk }}
           overwrite: true
-          file_glob: true
 
       - name: "Gradle Bundle AAB"
         if: ${{ !github.event.release.prerelease }}
@@ -196,7 +194,7 @@ jobs:
 
       - name: "Upload Bundle to Artifacts"
         if: ${{ !github.event.release.prerelease }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: bundle
           path: ${{ env.aab_path }}
@@ -219,7 +217,7 @@ jobs:
 
       - name: "Upload Google Play"
         if: ${{ github.event_name == 'release' && !github.event.release.prerelease }}
-        uses: r0adkll/upload-google-play@v1
+        uses: r0adkll/upload-google-play@935ef9c68bb393a8e6116b1575626a7f5be3a7fb # v1.1.3
         with:
           serviceAccountJsonPlainText: ${{ secrets.GOOGLE_SERVICE_ACCOUNT_JSON }}
           packageName: ${{ env.package_name }}
@@ -266,6 +264,6 @@ jobs:
 
       - name: "Send Failure Notification"
         if: ${{ failure() && github.event_name == 'release' }}
-        uses: sarisia/actions-status-discord@v1
+        uses: sarisia/actions-status-discord@eb045afee445dc055c18d3d90bd0f244fd062708 # v1.16.0
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK }}
diff --git a/.github/yamllint.yaml b/.github/yamllint.yaml
new file mode 100644
index 0000000..38237e5
--- /dev/null
+++ b/.github/yamllint.yaml
@@ -0,0 +1,7 @@
+extends: relaxed
+
+ignore-from-file: .gitignore
+
+rules:
+  line-length:
+    max: 119
diff --git a/README.md b/README.md
index 1cfe6af..009eec3 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,18 @@
 [![GitHub Downloads](https://img.shields.io/github/downloads/cssnr/zipline-android/total?logo=android)](https://github.com/cssnr/zipline-android/releases/latest/download/app-release.apk)
 [![GitHub Release Version](https://img.shields.io/github/v/release/cssnr/zipline-android?logo=github&label=latest)](https://github.com/cssnr/zipline-android/releases/latest)
-[![GitHub Docs Last Commit](https://img.shields.io/github/last-commit/cssnr/zipline-android-docs?logo=vitepress&logoColor=white&label=docs)](https://zipline-android.cssnr.com/)
-[![GitHub Last Commit](https://img.shields.io/github/last-commit/cssnr/zipline-android?logo=github&label=updated)](https://github.com/cssnr/zipline-android/pulse)
-[![Lint](https://img.shields.io/github/actions/workflow/status/cssnr/zipline-android/lint.yaml?logo=cachet&label=lint)](https://github.com/cssnr/zipline-android/actions/workflows/lint.yaml)
-[![Release](https://img.shields.io/github/actions/workflow/status/cssnr/zipline-android/release.yaml?logo=cachet&label=release)](https://github.com/cssnr/zipline-android/actions/workflows/release.yaml)
+[![Workflow Lint](https://img.shields.io/github/actions/workflow/status/cssnr/zipline-android/lint.yaml?logo=testcafe&logoColor=white&label=lint)](https://github.com/cssnr/zipline-android/actions/workflows/lint.yaml)
+[![Workflow Release](https://img.shields.io/github/actions/workflow/status/cssnr/zipline-android/release.yaml?logo=testcafe&logoColor=white&label=release)](https://github.com/cssnr/zipline-android/actions/workflows/release.yaml)
 [![AGP Version](https://img.shields.io/badge/dynamic/toml?logo=gradle&label=agp&query=%24.versions.agp&url=https%3A%2F%2Fraw.githubusercontent.com%2Fcssnr%2Fzipline-android%2Frefs%2Fheads%2Fmaster%2Fgradle%2Flibs.versions.toml)](https://github.com/cssnr/zipline-android/blob/master/gradle/libs.versions.toml#L2)
-[![GitHub Repo Size](https://img.shields.io/github/repo-size/cssnr/zipline-android?logo=bookstack&logoColor=white&label=repo%20size)](https://github.com/cssnr/zipline-android)
-[![GitHub Top Language](https://img.shields.io/github/languages/top/cssnr/zipline-android?logo=htmx)](https://github.com/cssnr/zipline-android)
-[![GitHub Discussions](https://img.shields.io/github/discussions/cssnr/zipline-android?logo=github)](https://github.com/cssnr/zipline-android/discussions)
-[![GitHub Forks](https://img.shields.io/github/forks/cssnr/zipline-android?style=flat&logo=github)](https://github.com/cssnr/zipline-android/forks)
-[![GitHub Repo Stars](https://img.shields.io/github/stars/cssnr/zipline-android?style=flat&logo=github)](https://github.com/cssnr/zipline-android/stargazers)
-[![GitHub Org Stars](https://img.shields.io/github/stars/cssnr?style=flat&logo=github&label=org%20stars)](https://cssnr.com/)
+[![GitHub Docs Last Commit](https://img.shields.io/github/last-commit/cssnr/zipline-android-docs?logo=vitepress&logoColor=white&label=docs)](https://zipline-android.cssnr.com/)
+[![GitHub Last Commit](https://img.shields.io/github/last-commit/cssnr/zipline-android?logo=listenhub&label=updated)](https://github.com/cssnr/zipline-android/pulse)
+[![GitHub Repo Size](https://img.shields.io/github/repo-size/cssnr/zipline-android?logo=buffer&label=repo%20size)](https://github.com/cssnr/zipline-android?tab=readme-ov-file#readme)
+[![GitHub Top Language](https://img.shields.io/github/languages/top/cssnr/zipline-android?logo=devbox)](https://github.com/cssnr/zipline-android?tab=readme-ov-file#readme)
+[![GitHub Contributors](https://img.shields.io/github/contributors-anon/cssnr/zipline-android?logo=southwestairlines)](https://github.com/cssnr/zipline-android/graphs/contributors)
+[![GitHub Issues](https://img.shields.io/github/issues/cssnr/zipline-android?logo=codeforces&logoColor=white)](https://github.com/cssnr/zipline-android/issues)
+[![GitHub Discussions](https://img.shields.io/github/discussions/cssnr/zipline-android?logo=theconversation)](https://github.com/cssnr/zipline-android/discussions)
+[![GitHub Forks](https://img.shields.io/github/forks/cssnr/zipline-android?style=flat&logo=forgejo&logoColor=white)](https://github.com/cssnr/zipline-android/forks)
+[![GitHub Repo Stars](https://img.shields.io/github/stars/cssnr/zipline-android?style=flat&logo=gleam&logoColor=white)](https://github.com/cssnr/zipline-android/stargazers)
+[![GitHub Org Stars](https://img.shields.io/github/stars/cssnr?style=flat&logo=apachespark&logoColor=white&label=org%20stars)](https://cssnr.github.io/)
 [![Discord](https://img.shields.io/discord/899171661457293343?logo=discord&logoColor=white&label=discord&color=7289da)](https://discord.gg/wXy6m2X8wY)
 [![Ko-fi](https://img.shields.io/badge/Ko--fi-72a5f2?logo=kofi&label=support)](https://ko-fi.com/cssnr)
 [![](https://repository-images.githubusercontent.com/963715375/e18a8ea8-f964-4088-852b-98f51631877f)](https://zipline-android.cssnr.com/)
@@ -38,11 +40,11 @@ Native Kotlin Android Application with a Mobile First Design.
 Everything is cached and images are not downloaded over metered connections unless enabled.
 User profile and stats widget are updated in the background with a user configurable task.
 
-**More information available on the website:** https://zipline-android.cssnr.com/
-
 _We are also developing a browser addon for all major browsers including Firefox Android:
 [Zipline Web Extension](https://github.com/cssnr/zipline-extension?tab=readme-ov-file#readme)_
 
+[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/)
+
 ## Install
 
 > [!NOTE]  
@@ -85,9 +87,9 @@ should take you to the settings area to allow installation if not already enable
 
 </details>
 
-### Setup
+[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/)
 
-Setup guides available [on the website](https://zipline-android.cssnr.com/guides/get-started).
+### Setup
 
 1. [Install](#Install) and open the app on your device.
 2. Log in as you normally would on the website.
@@ -149,6 +151,8 @@ Features are documented [on the website](https://zipline-android.cssnr.com/guide
 
 If you are having trouble using the app, support is available via [GitHub](#support) or [Discord](https://discord.gg/wXy6m2X8wY).
 
+[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/)
+
 ## Screenshots
 
 A slideshow is available [on the website](https://zipline-android.cssnr.com/guides/features#screenshots).
@@ -192,7 +196,7 @@ A slideshow is available [on the website](https://zipline-android.cssnr.com/guid
 
 ## Support
 
-Documentation Site: https://zipline-android.cssnr.com/
+[![View Documentation](https://img.shields.io/badge/view_documentation-blue?style=for-the-badge&logo=googledocs&logoColor=white)](https://zipline-android.cssnr.com/)
 
 For general help or to request a feature, see:
 
diff --git a/Taskfile.yml b/Taskfile.yml
new file mode 100644
index 0000000..29a9b50
--- /dev/null
+++ b/Taskfile.yml
@@ -0,0 +1,24 @@
+# yaml-language-server: $schema=https://taskfile.dev/schema.json
+version: "3"
+
+tasks:
+  lint:
+    desc: Lint
+    cmd: |
+      prettier --check .
+      yamllint -c .github/yamllint.yaml .
+      actionlint -shellcheck="-e SC2129"
+      shellcheck .github/scripts/prepare.sh
+
+  format:
+    desc: Format
+    aliases: [fmt]
+    cmd: |
+      prettier --write .
+
+  build:
+    desc: Build (recommended android studio)
+    vars:
+      GRADLEW: 'gradlew{{if eq OS "windows"}}.bat{{end}}'
+    cmd: |
+      ./{{.GRADLEW}} assemble {{.CLI_ARGS}}

From f8bef6dc052c0c42a64c2d8e867047a38df1c912 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 16 Feb 2026 13:43:37 -0800
Subject: [PATCH 3/6] Lint

---
 .github/workflows/release.yaml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 508aa77..0d8cf8b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -175,11 +175,11 @@ jobs:
         continue-on-error: true
         run: |
           echo "env.aab_path: ${{ env.aab_path }}"
-          ls -lAh ${{ env.aab_path }} ||:
+          ls -lAh "${{ env.aab_path }}" ||:
           echo "env.debug_symbols: ${{ env.debug_symbols }}"
-          ls -lAh ${{ env.debug_symbols }} ||:
+          ls -lAh "${{ env.debug_symbols }}" ||:
           echo "env.mapping_file: ${{ env.mapping_file }}"
-          ls -lAh $(dirname ${{ env.debug_symbols }}) ||:
+          ls -lAh "$(dirname "${{ env.debug_symbols }}")" ||:
 
       - name: "Sign Bundle"
         if: ${{ !github.event.release.prerelease }}
@@ -246,21 +246,21 @@ jobs:
         if: ${{ !github.event.act }}
         continue-on-error: true
         run: |
-          echo -e "## Android Release\n\n" >> $GITHUB_STEP_SUMMARY
+          echo -e "## Android Release\n\n" >> "$GITHUB_STEP_SUMMARY"
 
-          echo -e "Final APK: \`${{ env.signed_apk }}\`\n\n" >> $GITHUB_STEP_SUMMARY
+          echo -e "Final APK: \`${{ env.signed_apk }}\`\n\n" >> "$GITHUB_STEP_SUMMARY"
 
-          echo -e "<details><summary>Build Artifacts</summary>\n\n" >> $GITHUB_STEP_SUMMARY
-          echo -e "\`\`\`text\n$(ls -lAh ${{ env.apk_path }})\n\`\`\`\n\n" >> $GITHUB_STEP_SUMMARY
-          echo -e "</details>\n\n" >> $GITHUB_STEP_SUMMARY
+          echo -e "<details><summary>Build Artifacts</summary>\n\n" >> "$GITHUB_STEP_SUMMARY"
+          echo -e "\`\`\`text\n$(ls -lAh ${{ env.apk_path }})\n\`\`\`\n\n" >> "$GITHUB_STEP_SUMMARY"
+          echo -e "</details>\n\n" >> "$GITHUB_STEP_SUMMARY"
 
           if [ -f "${{ env.apk_path }}/output-metadata.json" ];then
-            echo -e "<details><summary>File: output-metadata.json</summary>\n\n" >> $GITHUB_STEP_SUMMARY
-            echo -e "\`\`\`json\n$(cat ${{ env.apk_path }}/output-metadata.json)\n\`\`\`\n\n" >> $GITHUB_STEP_SUMMARY
-            echo -e "</details>\n\n" >> $GITHUB_STEP_SUMMARY
+            echo -e "<details><summary>File: output-metadata.json</summary>\n\n" >> "$GITHUB_STEP_SUMMARY"
+            echo -e "\`\`\`json\n$(cat ${{ env.apk_path }}/output-metadata.json)\n\`\`\`\n\n" >> "$GITHUB_STEP_SUMMARY"
+            echo -e "</details>\n\n" >> "$GITHUB_STEP_SUMMARY"
           fi
 
-          echo -e "\n\n---" >> $GITHUB_STEP_SUMMARY
+          echo -e "\n\n---" >> "$GITHUB_STEP_SUMMARY"
 
       - name: "Send Failure Notification"
         if: ${{ failure() && github.event_name == 'release' }}

From 8de6e7e926a67e43a11ecf5e1f014100b194ea24 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 16 Feb 2026 13:52:29 -0800
Subject: [PATCH 4/6] Add Notes

---
 app/src/main/java/org/cssnr/zipline/api/ServerApi.kt | 3 ++-
 app/src/main/res/layout/fragment_login.xml           | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt b/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
index 5a9e910..938cc90 100644
--- a/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
+++ b/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
@@ -73,6 +73,7 @@ class ServerApi(private val context: Context, url: String? = null) {
         Log.d("Api[login]", "$user - $pass - $code")
 
         return try {
+            // NOTE: Added for nullable adapter - SkipNullsAdapterFactory
             val codeValue = if (code.isNullOrBlank()) null else code
             val loginResponse = api.postAuthLogin(LoginRequest(user, pass, codeValue))
             Log.i("Api[login]", "loginResponse.code(): ${loginResponse.code()}")
@@ -849,7 +850,7 @@ data class ErrorResponse(val error: String)
 fun Response<*>.parseErrorBody(context: Context): String? {
     val errorBody = errorBody() ?: return null
     val moshi = Moshi.Builder()
-        .add(SkipNullsAdapterFactory())
+        .add(SkipNullsAdapterFactory()) // NOTE: Added for nullable adapter - SkipNullsAdapterFactory
         .build()
     val adapter = moshi.adapter(ErrorResponse::class.java)
     return errorBody.source().use { source ->
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 79af110..835bc50 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -113,6 +113,7 @@
             android:maxLength="6"
             android:drawableEnd="@drawable/md_password_2_24px"
             android:drawableTint="?android:attr/textColorTertiary"
+            android:visibility="visible"
             tools:visibility="visible" />
     </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>

From 486caf63d6343d97016ff49394f39ffb843ef605 Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 16 Feb 2026 13:59:08 -0800
Subject: [PATCH 5/6] Cleanup

---
 .gitignore                                        |  8 +++-----
 .prettierignore                                   | 15 ++++-----------
 .../main/java/org/cssnr/zipline/api/ServerApi.kt  |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 67e4e53..a828ca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,17 @@
+# Generic
 .DS_Store
-
 .idea/
 *.iml
-
 **/build/
+**/dist/
 .gradle/
 .kotlin/
 captures/
 app/debug
 app/release
-
+# App
 local.properties
 *.keystore
 *.logcat
 **/google-services.json
 **/firebase-adminsdk.json
-
-**/dist/
diff --git a/.prettierignore b/.prettierignore
index ac11c51..e9257f7 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,11 +1,4 @@
-# IDE
-.idea/
-.vscode/
-
-# Build
-**/dist/
-**/node_modules/
-.github/assets/
-
-# App
-app/src/main/assets/preview/**
+.github/assets
+.github/disabled
+.github/pull_request_template.md
+app/src/main/assets/preview
diff --git a/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt b/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
index 938cc90..5586a3f 100644
--- a/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
+++ b/app/src/main/java/org/cssnr/zipline/api/ServerApi.kt
@@ -850,7 +850,7 @@ data class ErrorResponse(val error: String)
 fun Response<*>.parseErrorBody(context: Context): String? {
     val errorBody = errorBody() ?: return null
     val moshi = Moshi.Builder()
-        .add(SkipNullsAdapterFactory()) // NOTE: Added for nullable adapter - SkipNullsAdapterFactory
+        .add(SkipNullsAdapterFactory()) // NOTE: Added for nullable adapter
         .build()
     val adapter = moshi.adapter(ErrorResponse::class.java)
     return errorBody.source().use { source ->

From 3e17d51b097677ba35d0f18d3e7103492ee4be5f Mon Sep 17 00:00:00 2001
From: Shane <6071159+smashedr@users.noreply.github.com>
Date: Mon, 16 Feb 2026 14:01:25 -0800
Subject: [PATCH 6/6] Update Code Message

---
 app/src/main/res/layout/fragment_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 835bc50..1df0ec4 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -108,7 +108,7 @@
             android:layout_height="48dp"
             android:padding="10dp"
             android:autofillHints=""
-            android:hint="Two-Factor Code"
+            android:hint="Optional 2Factor Code"
             android:inputType="number"
             android:maxLength="6"
             android:drawableEnd="@drawable/md_password_2_24px"