From 3aa16906d68566f8916b93506a5dd892497fa947 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 10:55:49 -0700
Subject: [PATCH 01/80] Add Actions linting
---
.github/workflows/format_and_lint.yml | 50 +++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 .github/workflows/format_and_lint.yml
diff --git a/.github/workflows/format_and_lint.yml b/.github/workflows/format_and_lint.yml
new file mode 100644
index 000000000..03e98e6b0
--- /dev/null
+++ b/.github/workflows/format_and_lint.yml
@@ -0,0 +1,50 @@
+---
+# template source: https://github.com/bretfisher/super-linter-workflow/blob/main/templates/call-super-linter.yaml
+name: Lint Code Base
+
+on:
+ # run anytime a PR is merged to main or a direct push to main
+ push:
+ branches: [main]
+
+ # run on any push to a PR branch
+ pull_request:
+
+ # run on demand
+ workflow_dispatch:
+
+# cancel any previously-started, yet still active runs of this workflow on the same branch
+concurrency:
+ group: ${{ github.ref }}-${{ github.workflow }}
+ cancel-in-progress: true
+
+permissions: read-all
+
+# adapted from https://mskelton.medium.com/auto-formatting-code-using-prettier-and-github-actions-ed458f58b7df
+jobs:
+ call-super-linter:
+ # needs: format
+ name: Call Super-Linter
+
+ permissions:
+ contents: read # clone the repo to lint
+ statuses: write # read/write to repo custom statuses
+
+ ### use Reusable Workflows to call my workflow remotely
+ ### https://docs.github.com/en/actions/learn-github-actions/reusing-workflows
+ ### you can also call workflows from inside the same repo via file path
+
+ # FIXME: customize uri to point to your own reusable linter repository
+ uses: polygeist111/super-linter-workflow/.github/workflows/reusable-super-linter.yaml@main
+ # TODO: update url to point to gb reusable linter, not thalia's
+
+ ### Optional settings examples
+
+ with:
+ ### For a DevOps-focused repository. Prevents some code-language linters from running
+ ### defaults to false
+ # devops-only: false
+
+ ### A regex to exclude files from linting
+ ### defaults to empty
+ filter-regex-exclude: src/tarpit/raw_downloads/*
From 5f96903188c9b7efdc1a9d1a86f934b629bedb4d Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:19:05 -0700
Subject: [PATCH 02/80] Implement pre-commit formatting with Prettier
---
.husky/_/pre-commit | 4 ++++
.prettierignore | 2 ++
package-lock.json | 45 +++++++++++++++++++++++++++++++++++++++++++++
package.json | 9 +++++++++
4 files changed, 60 insertions(+)
create mode 100755 .husky/_/pre-commit
create mode 100644 .prettierignore
create mode 100644 package-lock.json
create mode 100644 package.json
diff --git a/.husky/_/pre-commit b/.husky/_/pre-commit
new file mode 100755
index 000000000..fc7f8b24c
--- /dev/null
+++ b/.husky/_/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"
+
+npm run format
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 000000000..227b71fe6
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+build
+coverage
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..d05483656
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,45 @@
+{
+ "name": "Project-Mesh",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "devDependencies": {
+ "husky": "^9.1.7",
+ "prettier": "^3.6.2"
+ }
+ },
+ "node_modules/husky": {
+ "version": "9.1.7",
+ "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+ "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "husky": "bin.js"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/typicode"
+ }
+ },
+ "node_modules/prettier": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "prettier": "bin/prettier.cjs"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
+ }
+ }
+ }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000000000..9be7e5054
--- /dev/null
+++ b/package.json
@@ -0,0 +1,9 @@
+{
+ "scripts": {
+ "format": "prettier --write . --ignore-unknown"
+ },
+ "devDependencies": {
+ "husky": "^9.1.7",
+ "prettier": "^3.6.2"
+ }
+}
From 428e12265e68f25984195cd6c874f04c89fc957a Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:20:33 -0700
Subject: [PATCH 03/80] Add Prettier, Super-Linter badges
---
README.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.md b/README.md
index ddb1d424c..61d8516fe 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@ New version by wil-mesh-rmit
Project Mesh runs locally on an android device. Build the project then either export the APK and send to the device, or use ADB to install. The app only works on physical devices, and not the android simulator.
+[](https://github.com/marketplace/actions/super-linter) [](https://github.com/prettier/prettier)
+
# Deployment Instructions
The Android app runs independently of an internet connection. The APK needs to be installed in each phone, then the phones are able to connect to each other from within the app.
1. Open the app
From e5fa935d9d4b7df35867afe2c9dae231ff6d4a5c Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:22:33 -0700
Subject: [PATCH 04/80] Reformat badges
---
README.md | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 61d8516fe..80bdd629e 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,12 @@ New version by wil-mesh-rmit
Project Mesh runs locally on an android device. Build the project then either export the APK and send to the device, or use ADB to install. The app only works on physical devices, and not the android simulator.
-[](https://github.com/marketplace/actions/super-linter) [](https://github.com/prettier/prettier)
+
+
+[](https://github.com/marketplace/actions/super-linter)
+[](https://github.com/prettier/prettier)
+
+
# Deployment Instructions
The Android app runs independently of an internet connection. The APK needs to be installed in each phone, then the phones are able to connect to each other from within the app.
From 3737c0351a700bd380d5f6e7a5d0e6feaacf2766 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:32:23 -0700
Subject: [PATCH 05/80] Correct badges
---
README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 80bdd629e..1e363e466 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,12 @@ New version by wil-mesh-rmit
Project Mesh runs locally on an android device. Build the project then either export the APK and send to the device, or use ADB to install. The app only works on physical devices, and not the android simulator.
-
+
-[](https://github.com/marketplace/actions/super-linter)
-[](https://github.com/prettier/prettier)
+
+
-
+
# Deployment Instructions
The Android app runs independently of an internet connection. The APK needs to be installed in each phone, then the phones are able to connect to each other from within the app.
From 5124610ed7647210644b4fc0a49dcd9f5e70f2e1 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:36:24 -0700
Subject: [PATCH 06/80] Test pre-commit Prettier action
This commit will be effectively rolled back, it's just to test Prettier in action
---
prettier_test.js | 7 +++++++
1 file changed, 7 insertions(+)
create mode 100644 prettier_test.js
diff --git a/prettier_test.js b/prettier_test.js
new file mode 100644
index 000000000..a9d6aebbc
--- /dev/null
+++ b/prettier_test.js
@@ -0,0 +1,7 @@
+const name = "James";
+const person ={first: name }
+console. log(person);
+const sayHelloLinting = (fName) => { console. log(`Hello linting, ${fName}`) }
+sayHelloLinting('James');
+// this code is not project-relevant and will be removed
+// it is simply to test that Prettier is functioning correctly as a pre-commit action
\ No newline at end of file
From e16f9ae8e3e7fce383232bf4358dda5f0b18fe2c Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:40:42 -0700
Subject: [PATCH 07/80] Debug Prettier pre-commit (#1)
Add back husky install script in package.json
---
package.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9be7e5054..def90ffdb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
{
"scripts": {
- "format": "prettier --write . --ignore-unknown"
+ "format": "prettier --write . --ignore-unknown",
+ "prepare": "husky install"
},
"devDependencies": {
"husky": "^9.1.7",
From a45ebec4b8c032df86d0d504ecb9c4ad194c3ee3 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:51:51 -0700
Subject: [PATCH 08/80] Debug Prettier pre-commit (#2)
---
.husky/.gitignore | 1 +
.husky/pre-commit | 4 ++++
2 files changed, 5 insertions(+)
create mode 100644 .husky/.gitignore
create mode 100755 .husky/pre-commit
diff --git a/.husky/.gitignore b/.husky/.gitignore
new file mode 100644
index 000000000..c9cdc63b0
--- /dev/null
+++ b/.husky/.gitignore
@@ -0,0 +1 @@
+_
\ No newline at end of file
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 000000000..fe0f899a1
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/_/h"
+
+npm run format
\ No newline at end of file
From ef08187b9e2954e2280ef708011eafc7f2744a7c Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 11:58:17 -0700
Subject: [PATCH 09/80] Debug Prettier pre-commit (#3)
Add back lint-staged
---
.husky/_/pre-commit | 4 -
.husky/pre-commit | 2 +-
package-lock.json | 489 ++++++++++++++++++++++++++++++++++++++++++++
package.json | 4 +
4 files changed, 494 insertions(+), 5 deletions(-)
delete mode 100755 .husky/_/pre-commit
diff --git a/.husky/_/pre-commit b/.husky/_/pre-commit
deleted file mode 100755
index fc7f8b24c..000000000
--- a/.husky/_/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname "$0")/h"
-
-npm run format
\ No newline at end of file
diff --git a/.husky/pre-commit b/.husky/pre-commit
index fe0f899a1..f8d714904 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname "$0")/_/h"
-npm run format
\ No newline at end of file
+npx lint-staged
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index d05483656..1752a2326 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,9 +6,168 @@
"": {
"devDependencies": {
"husky": "^9.1.7",
+ "lint-staged": "^16.2.6",
"prettier": "^3.6.2"
}
},
+ "node_modules/ansi-escapes": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz",
+ "integrity": "sha512-Zhl0ErHcSRUaVfGUeUdDuLgpkEo8KIFjB4Y9uAc46ScOpdDiU1Dbyplh7qWJeJ/ZHpbyMSM26+X3BySgnIz40Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "environment": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/ansi-regex": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+ "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+ }
+ },
+ "node_modules/ansi-styles": {
+ "version": "6.2.3",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+ "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/braces": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "fill-range": "^7.1.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/cli-cursor": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+ "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "restore-cursor": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/cli-truncate": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.1.1.tgz",
+ "integrity": "sha512-SroPvNHxUnk+vIW/dOSfNqdy1sPEFkrTk6TUtqLCnBlo3N7TNYYkzzN7uSD6+jVjrdO4+p8nH7JzH6cIvUem6A==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "slice-ansi": "^7.1.0",
+ "string-width": "^8.0.0"
+ },
+ "engines": {
+ "node": ">=20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/colorette": {
+ "version": "2.0.20",
+ "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+ "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/commander": {
+ "version": "14.0.2",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz",
+ "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=20"
+ }
+ },
+ "node_modules/emoji-regex": {
+ "version": "10.6.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+ "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/environment": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+ "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/eventemitter3": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+ "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/fill-range": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "to-regex-range": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/get-east-asian-width": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz",
+ "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
"node_modules/husky": {
"version": "9.1.7",
"resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
@@ -25,6 +184,177 @@
"url": "https://github.com/sponsors/typicode"
}
},
+ "node_modules/is-fullwidth-code-point": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
+ "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "get-east-asian-width": "^1.3.1"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
+ "node_modules/lint-staged": {
+ "version": "16.2.6",
+ "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-16.2.6.tgz",
+ "integrity": "sha512-s1gphtDbV4bmW1eylXpVMk2u7is7YsrLl8hzrtvC70h4ByhcMLZFY01Fx05ZUDNuv1H8HO4E+e2zgejV1jVwNw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "commander": "^14.0.1",
+ "listr2": "^9.0.5",
+ "micromatch": "^4.0.8",
+ "nano-spawn": "^2.0.0",
+ "pidtree": "^0.6.0",
+ "string-argv": "^0.3.2",
+ "yaml": "^2.8.1"
+ },
+ "bin": {
+ "lint-staged": "bin/lint-staged.js"
+ },
+ "engines": {
+ "node": ">=20.17"
+ },
+ "funding": {
+ "url": "https://opencollective.com/lint-staged"
+ }
+ },
+ "node_modules/listr2": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz",
+ "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "cli-truncate": "^5.0.0",
+ "colorette": "^2.0.20",
+ "eventemitter3": "^5.0.1",
+ "log-update": "^6.1.0",
+ "rfdc": "^1.4.1",
+ "wrap-ansi": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=20.0.0"
+ }
+ },
+ "node_modules/log-update": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+ "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-escapes": "^7.0.0",
+ "cli-cursor": "^5.0.0",
+ "slice-ansi": "^7.1.0",
+ "strip-ansi": "^7.1.0",
+ "wrap-ansi": "^9.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/micromatch": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "braces": "^3.0.3",
+ "picomatch": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=8.6"
+ }
+ },
+ "node_modules/mimic-function": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
+ "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/nano-spawn": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/nano-spawn/-/nano-spawn-2.0.0.tgz",
+ "integrity": "sha512-tacvGzUY5o2D8CBh2rrwxyNojUsZNU2zjNTzKQrkgGJQTbGAfArVWXSKMBokBeeg6C7OLRGUEyoFlYbfeWQIqw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=20.17"
+ },
+ "funding": {
+ "url": "https://github.com/sindresorhus/nano-spawn?sponsor=1"
+ }
+ },
+ "node_modules/onetime": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+ "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "mimic-function": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/pidtree": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
+ "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "pidtree": "bin/pidtree.js"
+ },
+ "engines": {
+ "node": ">=0.10"
+ }
+ },
"node_modules/prettier": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
@@ -40,6 +370,165 @@
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
+ },
+ "node_modules/restore-cursor": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+ "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "onetime": "^7.0.0",
+ "signal-exit": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/rfdc": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+ "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "dev": true,
+ "license": "ISC",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/slice-ansi": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
+ "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^6.2.1",
+ "is-fullwidth-code-point": "^5.0.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+ }
+ },
+ "node_modules/string-argv": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
+ "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.6.19"
+ }
+ },
+ "node_modules/string-width": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.1.0.tgz",
+ "integrity": "sha512-Kxl3KJGb/gxkaUMOjRsQ8IrXiGW75O4E3RPjFIINOVH8AMl2SQ/yWdTzWwF3FevIX9LcMAjJW+GRwAlAbTSXdg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "get-east-asian-width": "^1.3.0",
+ "strip-ansi": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=20"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/strip-ansi": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+ "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-regex": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+ }
+ },
+ "node_modules/to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "is-number": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=8.0"
+ }
+ },
+ "node_modules/wrap-ansi": {
+ "version": "9.0.2",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+ "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^6.2.1",
+ "string-width": "^7.0.0",
+ "strip-ansi": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/wrap-ansi/node_modules/string-width": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+ "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "emoji-regex": "^10.3.0",
+ "get-east-asian-width": "^1.0.0",
+ "strip-ansi": "^7.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/yaml": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+ "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+ "dev": true,
+ "license": "ISC",
+ "bin": {
+ "yaml": "bin.mjs"
+ },
+ "engines": {
+ "node": ">= 14.6"
+ }
}
}
}
diff --git a/package.json b/package.json
index def90ffdb..cc2f6955a 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,12 @@
"format": "prettier --write . --ignore-unknown",
"prepare": "husky install"
},
+ "lint-staged": {
+ "*": "prettier --write -- ignore-unknown"
+ },
"devDependencies": {
"husky": "^9.1.7",
+ "lint-staged": "^16.2.6",
"prettier": "^3.6.2"
}
}
From bcba2cda39eaf9704a4d326f3f11bcb626bece2d Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 12:02:20 -0700
Subject: [PATCH 10/80] Test Prettier pre-commit (#4)
---
prettier_test.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/prettier_test.js b/prettier_test.js
index a9d6aebbc..4ec3c6f83 100644
--- a/prettier_test.js
+++ b/prettier_test.js
@@ -4,4 +4,5 @@ console. log(person);
const sayHelloLinting = (fName) => { console. log(`Hello linting, ${fName}`) }
sayHelloLinting('James');
// this code is not project-relevant and will be removed
-// it is simply to test that Prettier is functioning correctly as a pre-commit action
\ No newline at end of file
+// it is simply to test that Prettier is functioning correctly as a pre-commit action
+// adding change to stage
\ No newline at end of file
From 8b09517ff4e049c03a76ac9967a7dc80ca28f684 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 12:24:44 -0700
Subject: [PATCH 11/80] Debug Prettier pre-commit (#5)
---
.husky/.gitignore | 6 +++++-
.husky/pre-commit | 4 ----
package.json | 2 +-
prettier_test.js | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100755 .husky/pre-commit
diff --git a/.husky/.gitignore b/.husky/.gitignore
index c9cdc63b0..7d11b16d7 100644
--- a/.husky/.gitignore
+++ b/.husky/.gitignore
@@ -1 +1,5 @@
-_
\ No newline at end of file
+# Ignore these
+_
+
+# But not these
+!_/pre-commit
\ No newline at end of file
diff --git a/.husky/pre-commit b/.husky/pre-commit
deleted file mode 100755
index f8d714904..000000000
--- a/.husky/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname "$0")/_/h"
-
-npx lint-staged
\ No newline at end of file
diff --git a/package.json b/package.json
index cc2f6955a..9abb9ee0b 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"prepare": "husky install"
},
"lint-staged": {
- "*": "prettier --write -- ignore-unknown"
+ "*": "prettier --write --ignore-unknown"
},
"devDependencies": {
"husky": "^9.1.7",
diff --git a/prettier_test.js b/prettier_test.js
index 4ec3c6f83..44f6ffb42 100644
--- a/prettier_test.js
+++ b/prettier_test.js
@@ -5,4 +5,4 @@ const sayHelloLinting = (fName) => { console. log(`Hello linting, ${fName}`) }
sayHelloLinting('James');
// this code is not project-relevant and will be removed
// it is simply to test that Prettier is functioning correctly as a pre-commit action
-// adding change to stage
\ No newline at end of file
+// adding change to stage :)
\ No newline at end of file
From 7cdabd99485b6ea856e6decc723e97fde12d52cd Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 12:28:50 -0700
Subject: [PATCH 12/80] Debug Prettier pre-commit (#6)
---
package.json | 5 +++--
prettier_test.js | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 9abb9ee0b..d5c09f1fb 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,11 @@
{
"scripts": {
"format": "prettier --write . --ignore-unknown",
- "prepare": "husky install"
+ "prepare": "husky install",
+ "lint-staged": "npx lint-staged"
},
"lint-staged": {
- "*": "prettier --write --ignore-unknown"
+ "**/*": "prettier --write .--ignore-unknown"
},
"devDependencies": {
"husky": "^9.1.7",
diff --git a/prettier_test.js b/prettier_test.js
index 44f6ffb42..5b30be991 100644
--- a/prettier_test.js
+++ b/prettier_test.js
@@ -5,4 +5,4 @@ const sayHelloLinting = (fName) => { console. log(`Hello linting, ${fName}`) }
sayHelloLinting('James');
// this code is not project-relevant and will be removed
// it is simply to test that Prettier is functioning correctly as a pre-commit action
-// adding change to stage :)
\ No newline at end of file
+// adding change to stage :3
\ No newline at end of file
From 38db27c3f8df25481586fa337b317e7478b46366 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:02:52 -0700
Subject: [PATCH 13/80] Debug Prettier pre-commit (#7)
---
.husky/.gitignore | 5 -----
.husky/_/pre-commit | 4 ++++
package.json | 2 +-
prettier_test.js | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
delete mode 100644 .husky/.gitignore
create mode 100755 .husky/_/pre-commit
diff --git a/.husky/.gitignore b/.husky/.gitignore
deleted file mode 100644
index 7d11b16d7..000000000
--- a/.husky/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Ignore these
-_
-
-# But not these
-!_/pre-commit
\ No newline at end of file
diff --git a/.husky/_/pre-commit b/.husky/_/pre-commit
new file mode 100755
index 000000000..656260e02
--- /dev/null
+++ b/.husky/_/pre-commit
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/h"
+
+npm run lint-staged
\ No newline at end of file
diff --git a/package.json b/package.json
index d5c09f1fb..d219f17c5 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"scripts": {
"format": "prettier --write . --ignore-unknown",
"prepare": "husky install",
- "lint-staged": "npx lint-staged"
+ "lint-staged": "lint-staged"
},
"lint-staged": {
"**/*": "prettier --write .--ignore-unknown"
diff --git a/prettier_test.js b/prettier_test.js
index 5b30be991..44f6ffb42 100644
--- a/prettier_test.js
+++ b/prettier_test.js
@@ -5,4 +5,4 @@ const sayHelloLinting = (fName) => { console. log(`Hello linting, ${fName}`) }
sayHelloLinting('James');
// this code is not project-relevant and will be removed
// it is simply to test that Prettier is functioning correctly as a pre-commit action
-// adding change to stage :3
\ No newline at end of file
+// adding change to stage :)
\ No newline at end of file
From 3011ce0a0df59b2436d6270721c65f1795b5b333 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:07:32 -0700
Subject: [PATCH 14/80] Debug Prettier pre-commit (#8)
---
package.json | 2 +-
prettier_test.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index d219f17c5..b970383f3 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"lint-staged": "lint-staged"
},
"lint-staged": {
- "**/*": "prettier --write .--ignore-unknown"
+ "**/*": "prettier --write .--ignore-unknown && echo 'Formatting a file :3'"
},
"devDependencies": {
"husky": "^9.1.7",
diff --git a/prettier_test.js b/prettier_test.js
index 44f6ffb42..5b30be991 100644
--- a/prettier_test.js
+++ b/prettier_test.js
@@ -5,4 +5,4 @@ const sayHelloLinting = (fName) => { console. log(`Hello linting, ${fName}`) }
sayHelloLinting('James');
// this code is not project-relevant and will be removed
// it is simply to test that Prettier is functioning correctly as a pre-commit action
-// adding change to stage :)
\ No newline at end of file
+// adding change to stage :3
\ No newline at end of file
From 909d253c38abf6c95f3101e512f6454d9361ed93 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:12:55 -0700
Subject: [PATCH 15/80] Debug Prettier pre-commit (#9)
---
.husky/_/pre-commit | 4 ----
.husky/pre-commit | 1 +
.prettierignore | 3 ++-
package.json | 4 ++--
prettier_test.js | 12 +++++++-----
5 files changed, 12 insertions(+), 12 deletions(-)
delete mode 100755 .husky/_/pre-commit
create mode 100644 .husky/pre-commit
diff --git a/.husky/_/pre-commit b/.husky/_/pre-commit
deleted file mode 100755
index 656260e02..000000000
--- a/.husky/_/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname "$0")/h"
-
-npm run lint-staged
\ No newline at end of file
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100644
index 000000000..0100eae14
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1 @@
+npm run lint-staged
diff --git a/.prettierignore b/.prettierignore
index 227b71fe6..00543e568 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,3 @@
build
-coverage
\ No newline at end of file
+coverage
+node_modules
\ No newline at end of file
diff --git a/package.json b/package.json
index b970383f3..971f31cbe 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
{
"scripts": {
"format": "prettier --write . --ignore-unknown",
- "prepare": "husky install",
+ "prepare": "husky",
"lint-staged": "lint-staged"
},
"lint-staged": {
- "**/*": "prettier --write .--ignore-unknown && echo 'Formatting a file :3'"
+ "**/*": "prettier --write . --ignore-unknown"
},
"devDependencies": {
"husky": "^9.1.7",
diff --git a/prettier_test.js b/prettier_test.js
index 5b30be991..a692bc0bc 100644
--- a/prettier_test.js
+++ b/prettier_test.js
@@ -1,8 +1,10 @@
const name = "James";
-const person ={first: name }
-console. log(person);
-const sayHelloLinting = (fName) => { console. log(`Hello linting, ${fName}`) }
-sayHelloLinting('James');
+const person = { first: name };
+console.log(person);
+const sayHelloLinting = (fName) => {
+ console.log(`Hello linting, ${fName}`);
+};
+sayHelloLinting("James");
// this code is not project-relevant and will be removed
// it is simply to test that Prettier is functioning correctly as a pre-commit action
-// adding change to stage :3
\ No newline at end of file
+// adding change to stage :)
From a49d74424ef542aed2c8cdb3359939f1ef00ff96 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 13:16:24 -0700
Subject: [PATCH 16/80] Test Prettier pre-commit (#10)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 971f31cbe..e3d1f9660 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
"lint-staged": "lint-staged"
},
"lint-staged": {
- "**/*": "prettier --write . --ignore-unknown"
+ "**/*": "prettier --write --ignore-unknown"
},
"devDependencies": {
"husky": "^9.1.7",
From 537913ed4759334b5d533cc98bd0cbbdbf796808 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 14:03:04 -0700
Subject: [PATCH 17/80] Finish Prettier Config
Add xml formatting, remove JS test file.
Tested use of Prettier Kotlin plugin, but it's ill-maintained and errors on many files so will try to use ktlint to handle kotlin formatting
---
.github/workflows/format_and_lint.yml | 2 +-
ci_readme.txt | 4 +++
package-lock.json | 41 +++++++++++++++++++++++++++
package.json | 8 +++++-
prettier_test.js | 10 -------
5 files changed, 53 insertions(+), 12 deletions(-)
create mode 100644 ci_readme.txt
delete mode 100644 prettier_test.js
diff --git a/.github/workflows/format_and_lint.yml b/.github/workflows/format_and_lint.yml
index 03e98e6b0..5c5d20e5b 100644
--- a/.github/workflows/format_and_lint.yml
+++ b/.github/workflows/format_and_lint.yml
@@ -37,7 +37,7 @@ jobs:
# FIXME: customize uri to point to your own reusable linter repository
uses: polygeist111/super-linter-workflow/.github/workflows/reusable-super-linter.yaml@main
# TODO: update url to point to gb reusable linter, not thalia's
-
+
### Optional settings examples
with:
diff --git a/ci_readme.txt b/ci_readme.txt
new file mode 100644
index 000000000..6e4c58969
--- /dev/null
+++ b/ci_readme.txt
@@ -0,0 +1,4 @@
+The CI pipeline behaves as follows:
+1. run Prettier on web-related filetypes, as well as XML
+ a. Do not use prettier-plugin-kotlin, it is not maintained and errors regularly
+2. On push, run super-linter. For all possible cases, run autofix (this covers Kotlin)
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 1752a2326..69db7e3bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,11 +5,35 @@
"packages": {
"": {
"devDependencies": {
+ "@prettier/plugin-xml": "^3.4.2",
"husky": "^9.1.7",
"lint-staged": "^16.2.6",
"prettier": "^3.6.2"
}
},
+ "node_modules/@prettier/plugin-xml": {
+ "version": "3.4.2",
+ "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.4.2.tgz",
+ "integrity": "sha512-/UyNlHfkuLXG6Ed85KB0WBF283xn2yavR+UtRibBRUcvEJId2DSLdGXwJ/cDa1X++SWDPzq3+GSFniHjkNy7yg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@xml-tools/parser": "^1.0.11"
+ },
+ "peerDependencies": {
+ "prettier": "^3.0.0"
+ }
+ },
+ "node_modules/@xml-tools/parser": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.11.tgz",
+ "integrity": "sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "chevrotain": "7.1.1"
+ }
+ },
"node_modules/ansi-escapes": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz",
@@ -65,6 +89,16 @@
"node": ">=8"
}
},
+ "node_modules/chevrotain": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.1.1.tgz",
+ "integrity": "sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "regexp-to-ast": "0.5.0"
+ }
+ },
"node_modules/cli-cursor": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
@@ -371,6 +405,13 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
+ "node_modules/regexp-to-ast": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz",
+ "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==",
+ "dev": true,
+ "license": "MIT"
+ },
"node_modules/restore-cursor": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
diff --git a/package.json b/package.json
index e3d1f9660..163121483 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,12 @@
"devDependencies": {
"husky": "^9.1.7",
"lint-staged": "^16.2.6",
- "prettier": "^3.6.2"
+ "prettier": "^3.6.2",
+ "@prettier/plugin-xml": "^3.4.2"
+ },
+ "prettier": {
+ "plugins": [
+ "@prettier/plugin-xml"
+ ]
}
}
diff --git a/prettier_test.js b/prettier_test.js
deleted file mode 100644
index a692bc0bc..000000000
--- a/prettier_test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const name = "James";
-const person = { first: name };
-console.log(person);
-const sayHelloLinting = (fName) => {
- console.log(`Hello linting, ${fName}`);
-};
-sayHelloLinting("James");
-// this code is not project-relevant and will be removed
-// it is simply to test that Prettier is functioning correctly as a pre-commit action
-// adding change to stage :)
From 6df090beb33f70a508576e043bc2526113318249 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 14:07:21 -0700
Subject: [PATCH 18/80] Format all XML and README files
---
README.md | 13 +-
app/src/main/AndroidManifest.xml | 94 +++++----
.../greybox/projectmesh/messaging/README.md | 183 ++++++++++++------
.../com/greybox/projectmesh/testing/README.md | 73 ++++---
.../com/greybox/projectmesh/user/README.md | 71 ++++---
.../res/drawable/ic_launcher_background.xml | 37 ++--
.../res/drawable/ic_launcher_foreground.xml | 120 +++++++-----
app/src/main/res/drawable/splash_screen.xml | 10 +-
.../main/res/layout/activity_crash_screen.xml | 33 ++--
app/src/main/res/layout/activity_main.xml | 34 ++--
.../main/res/mipmap-anydpi/ic_launcher.xml | 4 +-
.../res/mipmap-anydpi/ic_launcher_round.xml | 4 +-
app/src/main/res/values-cn/strings.xml | 12 +-
app/src/main/res/values-es/strings.xml | 28 ++-
app/src/main/res/values-fr-rCA/strings.xml | 32 ++-
app/src/main/res/values-night/styles.xml | 2 +-
app/src/main/res/values/attrs_main_view.xml | 2 +-
app/src/main/res/values/colors.xml | 4 +-
app/src/main/res/values/strings.xml | 18 +-
app/src/main/res/values/styles.xml | 2 +-
app/src/main/res/values/themes.xml | 10 +-
app/src/main/res/xml/backup_rules.xml | 5 +-
.../main/res/xml/data_extraction_rules.xml | 5 +-
app/src/main/res/xml/filepaths.xml | 6 +-
24 files changed, 493 insertions(+), 309 deletions(-)
diff --git a/README.md b/README.md
index 1e363e466..9fc333137 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,29 @@
# Project Mesh
--------------------
+
+---
+
Grey-box.ca
New version by wil-mesh-rmit
-Project Mesh runs locally on an android device. Build the project then either export the APK and send to the device, or use ADB to install. The app only works on physical devices, and not the android simulator.
+Project Mesh runs locally on an android device. Build the project then either export the APK and send to the device, or use ADB to install. The app only works on physical devices, and not the android simulator.
-
+
# Deployment Instructions
-The Android app runs independently of an internet connection. The APK needs to be installed in each phone, then the phones are able to connect to each other from within the app.
+
+The Android app runs independently of an internet connection. The APK needs to be installed in each phone, then the phones are able to connect to each other from within the app.
+
1. Open the app
2. When prompted, allow location and nearby devices permissions
3. Wait for a QR code to appear on screen
4. On each phone, use the ‘Scan QR code’ button to scan the codes of adjacent devices
5. Messages are able to be sent to connected devices with the ‘Send’ button and ‘Message’ text box
-
Credential info: N/A
GitHub URL: https://github.com/grey-box/Project-Mesh
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a5ed25801..8039c6669 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
-
-
+
+
@@ -24,24 +26,27 @@
+ android:name="android.hardware.camera"
+ android:required="false"
+ />
-
-
+ android:name="android.permission.NEARBY_WIFI_DEVICES"
+ android:usesPermissionFlags="neverForLocation"
+ />
+
+
-
+
-
+
@@ -55,26 +60,28 @@
+ android:name=".GlobalApp"
+ android:allowBackup="true"
+ android:dataExtractionRules="@xml/data_extraction_rules"
+ android:fullBackupContent="@xml/backup_rules"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/app_name"
+ android:usesCleartextTraffic="true"
+ android:roundIcon="@mipmap/ic_launcher_round"
+ android:supportsRtl="true"
+ android:theme="@style/Theme.AppCompat"
+ android:hardwareAccelerated="true"
+ tools:targetApi="31"
+ >
+ android:name=".MainActivity"
+ android:exported="true"
+ android:label="@string/app_name"
+ android:theme="@style/Theme.ProjectMesh.Launcher"
+ >
@@ -82,21 +89,28 @@
+ android:name="androidx.core.content.FileProvider"
+ android:authorities="com.greybox.projectmesh.fileprovider"
+ android:grantUriPermissions="true"
+ android:exported="false"
+ >
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/filepaths"
+ />
-
+ android:name="com.journeyapps.barcodescanner.CaptureActivity"
+ android:screenOrientation="portrait"
+ android:stateNotNeeded="true"
+ tools:replace="android:screenOrientation"
+ />
+
-
\ No newline at end of file
+
diff --git a/app/src/main/java/com/greybox/projectmesh/messaging/README.md b/app/src/main/java/com/greybox/projectmesh/messaging/README.md
index 120b26d98..d8f361889 100644
--- a/app/src/main/java/com/greybox/projectmesh/messaging/README.md
+++ b/app/src/main/java/com/greybox/projectmesh/messaging/README.md
@@ -1,9 +1,11 @@
# Messaging Module Documentation
## Overview
+
The messaging module is a core component of Project Mesh that enables peer-to-peer text communications between devices on the local mesh network. It provides a structured architecture for sending, receiving, storing, and displaying messages without requiring internet connectivity.
## Package Structure
+
```
messaging/
├── data/ # Data layer (entities and DAOs)
@@ -16,11 +18,14 @@ messaging/
├── screens/ # Composable UI screens
└── viewmodels/# View state management
```
-## Core Components
-### 1. Data Models
-#### Message Entity
-```Kotlin
+## Core Components
+
+### 1. Data Models
+
+#### Message Entity
+
+```Kotlin
@Serializable
@Entity(tableName = "message")
data class Message(
@@ -32,8 +37,10 @@ data class Message(
@ColumnInfo(name= "file") val file: URI? = null
)
```
+
#### Conversation Entity
-```Kotlin
+
+```Kotlin
@Entity(tableName = "conversations")
data class Conversation(
@PrimaryKey val id: String, // Composite ID of the two users
@@ -46,44 +53,63 @@ data class Conversation(
@ColumnInfo(name = "is_online") val isOnline: Boolean = false // Online status
)
```
+
### 2. Repositories
+
#### MessageRepository
+
Manages message data operations, including retrieving and storing messages.
+
#### ConversationRepository
+
Manages conversation data, including creating and updating conversations, tracking user statuses, and managing unread messages.
+
### 3. Network Components
+
#### MessageNetworkHandler
- Handles network communication for sending and receiving messages using HTTP requests.
+
+Handles network communication for sending and receiving messages using HTTP requests.
+
### 4. UI Components
+
#### ChatScreen
- Displays messages in a conversation and provides UI controls for sending new messages.
+
+Displays messages in a conversation and provides UI controls for sending new messages.
+
#### ConversationsHomeScreen
- Displays a list of all conversations with status indicators and message previews.
+
+Displays a list of all conversations with status indicators and message previews.
## Architecture and Data Flow
+
### Message Flow
#### 1. User Sends Message:
-* User enters text in ChatScreen and taps Send
-* ChatScreenViewModel processes the input
-* Message is first saved locally in the database
-* MessageNetworkHandler sends the message to recipient via HTTP
+
+- User enters text in ChatScreen and taps Send
+- ChatScreenViewModel processes the input
+- Message is first saved locally in the database
+- MessageNetworkHandler sends the message to recipient via HTTP
+
#### 2. Message Reception:
-* AppServer receives HTTP request on /chat endpoint
-* MessageNetworkHandler processes the incoming message
-* Message is stored in local database
-* ConversationRepository updates the conversation
-* UI is updated via StateFlow collection
+
+- AppServer receives HTTP request on /chat endpoint
+- MessageNetworkHandler processes the incoming message
+- Message is stored in local database
+- ConversationRepository updates the conversation
+- UI is updated via StateFlow collection
### Integration with Project Mesh Components
+
#### Network Integration
+
Messages are transmitted over the mesh network created by the Meshrabiya library. The system uses:
1. `AppServer`: Provides HTTP endpoints for receiving messages and handles file transfers.
2. `DeviceStatusManager`: Tracks online/offline status of devices to determine message deliverability.
3. `AndroidVirtualNode`: Manages the underlying mesh network connections.
-```kotlin
+```kotlin
// In AppServer.kt
// Handles incoming chat messages
else if(path.startsWith("/chat")) {
@@ -91,24 +117,26 @@ else if(path.startsWith("/chat")) {
val chatMessage = deserialzedJSON.content
val time = deserialzedJSON.dateReceived
val senderIp = deserialzedJSON.sender
-
+
// Handle message via MessageNetworkHandler
val message = MessageNetworkHandler.handleIncomingMessage(
chatMessage, time, senderIp, incomingfile
)
-
+
// Save to database
db.messageDao().addMessage(message)
}
```
-#### User System Integration
+#### User System Integration
+
Messages and conversations are linked to user profiles:
+
1. Each message contains a sender field with the username
2. Conversations use a composite ID created from the UUIDs of both participants
3. Online status is synchronized with the DeviceStatusManager
-```kotlin
+```kotlin
// In ConversationUtils.kt
fun createConversationId(uuid1: String, uuid2: String): String {
// Sort UUIDs to ensure consistent IDs regardless of sender/receiver
@@ -117,15 +145,21 @@ fun createConversationId(uuid1: String, uuid2: String): String {
```
#### Database Integration
+
The messaging module uses Room database for persistence:
+
1. **MeshDatabase**: Central database that contains tables for:
-* `messages`: Stores all message content
-* `conversations`: Stores conversation metadata
-* `users`: Stores user profile information
+
+- `messages`: Stores all message content
+- `conversations`: Stores conversation metadata
+- `users`: Stores user profile information
+
2. Relationship Flow:
-* Users have multiple Conversations
-* Conversations contain multiple Messages
-* Messages reference their Conversation via the chat field
+
+- Users have multiple Conversations
+- Conversations contain multiple Messages
+- Messages reference their Conversation via the chat field
+
```kotlin
// In MeshDatabase.kt
@Database(
@@ -143,35 +177,43 @@ abstract class MeshDatabase : RoomDatabase() {
abstract fun conversationDao(): ConversationDao
}
```
+
## Special Features
+
### Offline Messaging
+
1. Messages are always stored locally first
2. If recipient is offline, message remains in local database
3. UI indicates delivery status based on device connectivity
4. Messages appear in conversation history regardless of delivery status
+
### Test Device Integration
+
Special handling for test devices that simulate real users:
-* Online test device automatically responds with echo messages
-* Offline test device stores messages locally but never receives them
+
+- Online test device automatically responds with echo messages
+- Offline test device stores messages locally but never receives them
### File Attachments
+
1. Messages can include file URI attachments
2. Files are transferred separately using the file transfer system
3. Messages with attachments display file indicators in the UI
-### Usage Example
-#### Conversations Screen:
+### Usage Example
+
+#### Conversations Screen:
-* Online and Offline Users Appear With Appropriate Read Receipts from Built-in Sample Messages
-* Connected device appears in the Conversation Screen
+- Online and Offline Users Appear With Appropriate Read Receipts from Built-in Sample Messages
+- Connected device appears in the Conversation Screen
-#### Chat Screen Initial Impressions
+#### Chat Screen Initial Impressions
-* When chatting for the first time a prompt appears to start a chat
+- When chatting for the first time a prompt appears to start a chat
#### Sending A Message
@@ -184,7 +226,7 @@ Special handling for test devices that simulate real users:
fun sendChatMessage(virtualAddress: InetAddress, message: String, file: URI?) {
val sendTime = System.currentTimeMillis()
val isOnline = DeviceStatusManager.isDeviceOnline(ipAddress)
-
+
// Create message entity
val messageEntity = Message(
id = 0,
@@ -194,17 +236,17 @@ fun sendChatMessage(virtualAddress: InetAddress, message: String, file: URI?) {
chat = chatName,
file = file
)
-
+
viewModelScope.launch {
// Save to local database
db.messageDao().addMessage(messageEntity)
-
+
// Update conversation
conversationRepository.updateWithMessage(
conversationId = conversation.id,
message = messageEntity
)
-
+
// Send message if recipient is online
if (isOnline) {
appServer.sendChatMessageWithStatus(
@@ -214,11 +256,12 @@ fun sendChatMessage(virtualAddress: InetAddress, message: String, file: URI?) {
}
}
```
-#### Receiving and Displaying Messages
+
+#### Receiving and Displaying Messages
**Example**: Bob Recieves Message From Alice
-1. Conversation is Updated and Read Receipt is shown:
+1. Conversation is Updated and Read Receipt is shown:
@@ -226,7 +269,7 @@ fun sendChatMessage(virtualAddress: InetAddress, message: String, file: URI?) {
-3. When Going back to the Chat Screen Read Status is Updated:
+3. When Going back to the Chat Screen Read Status is Updated:
@@ -243,45 +286,57 @@ init {
}
}
```
+
## Best Practices
+
### 1. Consider Network Conditions:
-* Always check device online status before sending
-* Provide clear UI feedback for undelivered messages
-* Handle intermittent connectivity gracefully
+
+- Always check device online status before sending
+- Provide clear UI feedback for undelivered messages
+- Handle intermittent connectivity gracefully
### 2. Database Operations:
-* Perform all database operations on IO dispatchers
-* Use Room's Flow API for reactive UI updates
-* Keep transactions atomic to prevent data corruption
+
+- Perform all database operations on IO dispatchers
+- Use Room's Flow API for reactive UI updates
+- Keep transactions atomic to prevent data corruption
### 3. User Experience:
-* Show clear online/offline indicators
-* Provide delivery status for messages
-* Update conversation timestamps and previews promptly
+
+- Show clear online/offline indicators
+- Provide delivery status for messages
+- Update conversation timestamps and previews promptly
### 4. Security Considerations:
-* Validate message content before processing
-* Use proper JSON schema validation for incoming messages
-* Sanitize user input to prevent injection attacks
+
+- Validate message content before processing
+- Use proper JSON schema validation for incoming messages
+- Sanitize user input to prevent injection attacks
## Troubleshooting
+
### Common Issues
+
#### 1. Messages Not Sending:
-* Check device status in DeviceStatusManager
-* Verify network connectivity between devices
-* Confirm AppServer is running on both devices
+
+- Check device status in DeviceStatusManager
+- Verify network connectivity between devices
+- Confirm AppServer is running on both devices
#### 2. Missing Conversations:
-* Ensure user profile exchange was successful
-* Check conversation ID generation is consistent
-* Verify database migrations have completed
+
+- Ensure user profile exchange was successful
+- Check conversation ID generation is consistent
+- Verify database migrations have completed
#### 3. UI Not Updating:
-* Confirm StateFlow collection is active
-* Check database queries are properly observed
-* Verify Composable recomposition triggers
+
+- Confirm StateFlow collection is active
+- Check database queries are properly observed
+- Verify Composable recomposition triggers
## Future Enhancements
+
1. **Message Encryption**: Add end-to-end encryption for message content
2. **Message Status**: Add read receipts and delivery confirmations
3. **Rich Media**: Enhance support for images, videos, and other media types
diff --git a/app/src/main/java/com/greybox/projectmesh/testing/README.md b/app/src/main/java/com/greybox/projectmesh/testing/README.md
index d6a22a482..7b4f428cb 100644
--- a/app/src/main/java/com/greybox/projectmesh/testing/README.md
+++ b/app/src/main/java/com/greybox/projectmesh/testing/README.md
@@ -9,17 +9,17 @@ Project Mesh includes built-in test users to help with development and testing.
The application includes two test users:
1. **Online Test Device**
- - Name: "Test Echo Device (Online)"
- - IP Address: 192.168.0.99
- - Status: Always appears as online
- - Behavior: Automatically responds to messages with an echo reply
+ - Name: "Test Echo Device (Online)"
+ - IP Address: 192.168.0.99
+ - Status: Always appears as online
+ - Behavior: Automatically responds to messages with an echo reply
2. **Offline Test Device**
- - Name: "Test Echo Device (Offline)"
- - IP Address: 192.168.0.98
- - Status: Always appears as offline
- - Status: Always appears as offline
- - Behavior: Messages can be sent but will remain stored locally
+ - Name: "Test Echo Device (Offline)"
+ - IP Address: 192.168.0.98
+ - Status: Always appears as offline
+ - Status: Always appears as offline
+ - Behavior: Messages can be sent but will remain stored locally
**Only Online User Shows Up as Online**:
@@ -35,6 +35,7 @@ The application includes two test users:
## Usage Examples
### Testing Message Delivery
+
1. Navigate to the Chat screen
2. Select "Test Echo Device (Online)" from the conversation list
3. Send a message
@@ -43,6 +44,7 @@ The application includes two test users:
### Testing Offline Message Behavior
+
1. Navigate to the Chat screen
2. Select "Test Echo Device (Offline)" from the conversation list
3. Send a message
@@ -74,9 +76,12 @@ const val TEST_DEVICE_NAME_OFFLINE = "Test Echo Device (Offline)"
## Test User Integration
### How Test Users Connect with the Project Mesh Architecture
+
Test users are integrated into several key components of the Project Mesh architecture to simulate real devices without requiring actual physical connections. Here's how they interface with the core systems:
+
1. TestDeviceService Integration
-```kotlin
+
+```kotlin
// In TestDeviceService.kt
companion object {
const val TEST_DEVICE_IP = "192.168.0.99"
@@ -119,22 +124,24 @@ companion object {
Log.e("TestDeviceService", "Failed to initialize test device", e)
}
}
-
+
// Additional methods for test device functionality...
}
```
+
2. Global App Integration
-```kotlin
+
+```kotlin
// In GlobalApp.kt
override fun onCreate() {
super.onCreate()
-
+
// Other initialization code...
//Initialize test device:
TestDeviceService.initialize()
Log.d("MainActivity", "Test device initialized")
-
+
// Test conversation setup
insertTestConversations()
}
@@ -197,8 +204,10 @@ fun insertTestConversations() {
}
}
```
-3. AppServer Integration
-```kotlin
+
+3. AppServer Integration
+
+```kotlin
// In AppServer.kt
fun sendChatMessageWithStatus(address: InetAddress, time: Long, message: String, f: URI?): Boolean {
try {
@@ -218,7 +227,7 @@ fun sendChatMessageWithStatus(address: InetAddress, time: Long, message: String,
Log.d("AppServer", "Test device echoed message: $message")
return true
}
-
+
// Normal chat message handling for real devices...
}
catch (e: Exception) {
@@ -241,22 +250,24 @@ fun requestRemoteUserInfo(remoteAddr: InetAddress, port: Int = DEFAULT_PORT) {
DeviceStatusManager.updateDeviceStatus(ipAddress, false)
return
}
-
+
// Normal remote user info handling for real devices...
}
```
-4. DeviceStatusManager Integration
-```kotlin
+
+4. DeviceStatusManager Integration
+
+```kotlin
// In DeviceStatusManager.kt
object DeviceStatusManager {
// Other properties and methods...
-
+
//special test device addresses that should be handled differently
private val specialDevices = setOf(
"192.168.0.99", // Online test device
"192.168.0.98" // Offline test device
)
-
+
fun updateDeviceStatus(ipAddress: String, isOnline: Boolean, verified: Boolean = false) {
//if this is a special device, handle according to its predefined status
if (ipAddress == "192.168.0.99") { // Online test device
@@ -276,21 +287,23 @@ object DeviceStatusManager {
Log.d("DeviceStatusManager", "Updated test device status for $ipAddress: offline")
return
}
-
+
// Normal device status handling for real devices...
}
-
+
fun verifyDeviceStatus(ipAddress: String) {
// Skip verification for special test devices
if (ipAddress in specialDevices) {
return
}
-
+
// Normal device verification for real devices...
}
}
```
+
5. NetworkServiceViewModel Integration
+
```kotlin
// In NetworkScreenViewModel.kt
init {
@@ -313,21 +326,23 @@ init {
}
}
```
+
6. ConversationsHomeScreen Integration
Test devices appear in the conversations list as either online or offline contacts, with special handling to ensure they have the correct status regardless of actual network conditions.
7. ChatScreen Integration
-```kotlin
+
+```kotlin
// In ChatScreenViewModel.kt
fun sendChatMessage(virtualAddress: InetAddress, message: String, file: URI?) {
// Other processing...
-
+
viewModelScope.launch {
//save to local database
db.messageDao().addMessage(messageEntity)
//update convo with the new message
// ...
-
+
if (isOnline) {
try {
// Send message to real device
@@ -340,4 +355,4 @@ fun sendChatMessage(virtualAddress: InetAddress, message: String, file: URI?) {
}
```
-The test user system integrates smoothly with the existing architecture by implementing specialized handling at key decision points throughout the codebase. This allows the test devices to behave consistently and predictably while reusing much of the same code path as real devices.
\ No newline at end of file
+The test user system integrates smoothly with the existing architecture by implementing specialized handling at key decision points throughout the codebase. This allows the test devices to behave consistently and predictably while reusing much of the same code path as real devices.
diff --git a/app/src/main/java/com/greybox/projectmesh/user/README.md b/app/src/main/java/com/greybox/projectmesh/user/README.md
index 4b7a58b6d..b9ac34ebe 100644
--- a/app/src/main/java/com/greybox/projectmesh/user/README.md
+++ b/app/src/main/java/com/greybox/projectmesh/user/README.md
@@ -1,12 +1,16 @@
# User Profiles in Project Mesh
## Overview
+
Project Mesh implements a user profile system that allows devices to identify themselves on the mesh network. User profiles consist of a unique identifier (UUID), a display name, and network address information. This system enables personalized messaging and device identification across the mesh network.
+
## Key Components
+
### User Entity
+
The core of the user profile system is the UserEntity class, which stores all user data:
-```kotlin
+```kotlin
// In UserEntity.kt
@Serializable
@Entity(tableName = "users")
@@ -18,9 +22,11 @@ data class UserEntity(
)
```
-### User Repository
+### User Repository
+
The UserRepository manages all database operations related to user profiles:
-```kotlin
+
+```kotlin
// In UserRepository.kt
class UserRepository(private val userDao: UserDao) {
@@ -49,8 +55,11 @@ class UserRepository(private val userDao: UserDao) {
// Other repository methods...
}
```
+
### UserData Access Object (DAO)
+
The UserDao interface defines database operations:
+
```kotlin
// In UserDao.kt
@Dao
@@ -79,12 +88,14 @@ interface UserDao {
```
## User Profile Lifecycle
+
### First-time Setup
When a user first launches the app, they go through an onboarding process to set up their profile:
-```kotlin
+
+```kotlin
// In OnboardingViewModel.kt
fun handleFirstTimeSetup(onComplete: () -> Unit) {
viewModelScope.launch {
@@ -108,6 +119,7 @@ fun handleFirstTimeSetup(onComplete: () -> Unit) {
```
### User Information Exchange
+
When devices connect, they exchange user information:
**Before Name Exchange**:
@@ -117,11 +129,11 @@ When devices connect, they exchange user information:
-```kotlin
+```kotlin
// In AppServer.kt - requesting user info
fun requestRemoteUserInfo(remoteAddr: InetAddress, port: Int = DEFAULT_PORT) {
// Special handling for test devices...
-
+
scope.launch {
try {
val url = "http://${remoteAddr.hostAddress}:$port/myinfo"
@@ -130,7 +142,7 @@ fun requestRemoteUserInfo(remoteAddr: InetAddress, port: Int = DEFAULT_PORT) {
val response = httpClient.newCall(request).execute()
val userJson = response.body?.string()
-
+
if (!userJson.isNullOrEmpty()) {
// Decode JSON
val remoteUser = json.decodeFromString(UserEntity.serializer(), userJson)
@@ -141,7 +153,7 @@ fun requestRemoteUserInfo(remoteAddr: InetAddress, port: Int = DEFAULT_PORT) {
remoteUserWithIp.name,
remoteUserWithIp.address
)
-
+
// Update user status...
}
} catch (e: Exception) {
@@ -172,16 +184,17 @@ private fun handleMyInfoRequest(): Response {
```
### Profile Updates
+
Users can update their profile information in the Settings screen:
-*Found in Settings Under Network > Device Name*:
+_Found in Settings Under Network > Device Name_:
-*User name can be Updated* :
+_User name can be Updated_ :
-```kotlin
+```kotlin
// In SettingsScreen.kt
onDeviceNameChange = { newDeviceName ->
Log.d("BottomNavApp", "Device name changed to: $newDeviceName")
@@ -197,7 +210,7 @@ onDeviceNameChange = { newDeviceName ->
name = newDeviceName,
address = appServer.localVirtualAddr.hostAddress
)
-
+
// 2. Broadcast updated name to connected users
val connectedUsers = userRepository.getAllConnectedUsers()
connectedUsers.forEach { user ->
@@ -216,17 +229,19 @@ onDeviceNameChange = { newDeviceName ->
```
### Online Status Tracking
+
The application tracks which users are online using the DeviceStatusManager:
-```kotlin
+
+```kotlin
// In DeviceStatusManager.kt
object DeviceStatusManager {
private val _deviceStatusMap = MutableStateFlow>(emptyMap())
val deviceStatusMap: StateFlow> = _deviceStatusMap.asStateFlow()
-
+
// Updates a device's online status
fun updateDeviceStatus(ipAddress: String, isOnline: Boolean, verified: Boolean = false) {
// Special handling for test devices...
-
+
// For normal devices
if (verified) {
_deviceStatusMap.update { current ->
@@ -239,15 +254,18 @@ object DeviceStatusManager {
// Handle unverified status updates...
}
}
-
+
// Other status management methods...
}
```
+
## Integration with UI
+
User profiles are displayed in various parts of the UI:
-### Netowork List
-```kotlin
+### Netowork List
+
+```kotlin
// In WifiListItem.kt
@Composable
fun WifiListItem(
@@ -256,7 +274,7 @@ fun WifiListItem(
onClick: ((nodeAddress: String) -> Unit)? = null,
) {
// Other UI elements...
-
+
// obtain the device name according to the ip address
val user = runBlocking {
GlobalApp.GlobalUserRepo.userRepository.getUserByIp(wifiAddressDotNotation)
@@ -268,12 +286,12 @@ fun WifiListItem(
else {
Text(text = "Loading...", fontWeight = FontWeight.Bold)
}
-
+
// Other UI elements...
}
```
-### ChatScreen
+### ChatScreen
```kotlin
// In ChatScreen.kt
@@ -310,13 +328,13 @@ fun UserStatusBar(
// Row styling...
) {
// Status indicator dot...
-
+
// Status text
Text(
text = if (isOnline) "Online" else "Offline",
// Text styling...
)
-
+
// IP address
Text(
text = userAddress,
@@ -331,7 +349,7 @@ fun UserStatusBar(
### Conversations
-User profiles are linked to conversations for messaging:
+User profiles are linked to conversations for messaging:
```kotlin
// In ConversationRepository.kt
@@ -356,7 +374,7 @@ suspend fun getOrCreateConversation(localUuid: String, remoteUser: UserEntity):
)
conversationDao.insertConversation(conversation)
}
-
+
return conversation
}
```
@@ -370,6 +388,7 @@ suspend fun getOrCreateConversation(localUuid: String, remoteUser: UserEntity):
5. **Address Management**: IP addresses are managed dynamically based on network connectivity.
## Best Practices
+
When working with user profiles:
- **Always check for null**: IP addresses and user objects might be null, especially during initial setup.
@@ -390,4 +409,4 @@ When working with user profiles:
1. **Add profile pictures**: Consider adding the ability for users to set profile pictures.
2. **Enhance privacy options**: Allow users to control what information is shared.
-3. **Add user verification**: Implement a mechanism to verify user identities on the network.
\ No newline at end of file
+3. **Add user verification**: Implement a mechanism to verify user identities on the network.
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index 46d0ccf0c..2530ee71b 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,22 +1,23 @@
-
-
-
-
+
+
+
-
- - @color/gray_600
- @color/light_blue_600
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/attrs_main_view.xml b/app/src/main/res/values/attrs_main_view.xml
index 3a237aa94..a09f505d0 100644
--- a/app/src/main/res/values/attrs_main_view.xml
+++ b/app/src/main/res/values/attrs_main_view.xml
@@ -5,4 +5,4 @@
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 66e3f6cfb..dc51e0a56 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,4 +1,4 @@
-
+
#FFBB86FC
#FF6200EE
@@ -11,4 +11,4 @@
#FF039BE5
#FFBDBDBD
#FF757575
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d5c5fdc0e..2a11ce418 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,10 +4,16 @@
Start Hotspot
Stop Hotspot
Connect via QR Code Scan
- Connect via Entering Connect URI
+ Connect via Entering Connect URI
Share connect URI
- Wifi Station (Client) Connection
- Scan another device to join the Mesh
+ Wifi Station (Client) Connection
+ Scan another device to join the Mesh
Hotspot Status
Online
Offline
@@ -24,7 +30,9 @@
"3. Select Quick Share\n"
"4. Choose a nearby device you want to share the URI with"
- Enter Connect URI (Starts with "meshrabiya://")
+ Enter Connect URI (Starts with "meshrabiya://")
Send File
From
@@ -60,4 +68,4 @@
Chat
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e3ef8e827..5914c4940 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,4 +3,4 @@
- @color/gray_400
- @color/light_blue_400
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8f7e83969..47e238e73 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,7 +1,9 @@
-
-
+
-
@@ -10,4 +12,4 @@
- @drawable/splash_screen
-
\ No newline at end of file
+
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
index fa0f996d2..8f6a5d2d7 100644
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@@ -1,4 +1,5 @@
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index 9ee9997b0..57d37d48b 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -1,4 +1,5 @@
-
-
\ No newline at end of file
+
diff --git a/app/src/main/res/xml/filepaths.xml b/app/src/main/res/xml/filepaths.xml
index 4dec07c04..eaba7f643 100644
--- a/app/src/main/res/xml/filepaths.xml
+++ b/app/src/main/res/xml/filepaths.xml
@@ -1,4 +1,4 @@
-
+
-
-
\ No newline at end of file
+
+
From 5611477b5193ab80d9b64adb4e13e1e849c7f94a Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 14:35:03 -0700
Subject: [PATCH 19/80] Slight fix + test commit
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 163121483..39aa3006b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"scripts": {
"format": "prettier --write . --ignore-unknown",
- "prepare": "husky",
+ "prepare": "husky install",
"lint-staged": "lint-staged"
},
"lint-staged": {
From d8651620b1f2d4650010e937002e921e371ef797 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 14:55:32 -0700
Subject: [PATCH 20/80] Add commit message input to workflow_dispatch
---
.github/workflows/format_and_lint.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/format_and_lint.yml b/.github/workflows/format_and_lint.yml
index 5c5d20e5b..5ff62cfec 100644
--- a/.github/workflows/format_and_lint.yml
+++ b/.github/workflows/format_and_lint.yml
@@ -12,6 +12,11 @@ on:
# run on demand
workflow_dispatch:
+ inputs:
+ message:
+ description: "Custom message for the deployment"
+ required: false
+ type: string
# cancel any previously-started, yet still active runs of this workflow on the same branch
concurrency:
From e376ff810c757f3f09012c512eff32588ac6058e Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 30 Oct 2025 15:15:22 -0700
Subject: [PATCH 21/80] Remove prettier XML plugin
XML plugin causes errors in Super-Linter action flow. This is a known problem and is unlikely to be resolved
---
.github/workflows/format_and_lint.yml | 5 ++--
package-lock.json | 41 ---------------------------
package.json | 8 +-----
3 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/.github/workflows/format_and_lint.yml b/.github/workflows/format_and_lint.yml
index 5ff62cfec..484157456 100644
--- a/.github/workflows/format_and_lint.yml
+++ b/.github/workflows/format_and_lint.yml
@@ -1,6 +1,7 @@
---
# template source: https://github.com/bretfisher/super-linter-workflow/blob/main/templates/call-super-linter.yaml
name: Lint Code Base
+run-name: ${{ github.event.inputs.custom_run_name || github.workflow }}
on:
# run anytime a PR is merged to main or a direct push to main
@@ -13,8 +14,8 @@ on:
# run on demand
workflow_dispatch:
inputs:
- message:
- description: "Custom message for the deployment"
+ custom-run-name:
+ description: "Custom name for this Actions run"
required: false
type: string
diff --git a/package-lock.json b/package-lock.json
index 69db7e3bf..1752a2326 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,35 +5,11 @@
"packages": {
"": {
"devDependencies": {
- "@prettier/plugin-xml": "^3.4.2",
"husky": "^9.1.7",
"lint-staged": "^16.2.6",
"prettier": "^3.6.2"
}
},
- "node_modules/@prettier/plugin-xml": {
- "version": "3.4.2",
- "resolved": "https://registry.npmjs.org/@prettier/plugin-xml/-/plugin-xml-3.4.2.tgz",
- "integrity": "sha512-/UyNlHfkuLXG6Ed85KB0WBF283xn2yavR+UtRibBRUcvEJId2DSLdGXwJ/cDa1X++SWDPzq3+GSFniHjkNy7yg==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@xml-tools/parser": "^1.0.11"
- },
- "peerDependencies": {
- "prettier": "^3.0.0"
- }
- },
- "node_modules/@xml-tools/parser": {
- "version": "1.0.11",
- "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.11.tgz",
- "integrity": "sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "chevrotain": "7.1.1"
- }
- },
"node_modules/ansi-escapes": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.1.1.tgz",
@@ -89,16 +65,6 @@
"node": ">=8"
}
},
- "node_modules/chevrotain": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.1.1.tgz",
- "integrity": "sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==",
- "dev": true,
- "license": "Apache-2.0",
- "dependencies": {
- "regexp-to-ast": "0.5.0"
- }
- },
"node_modules/cli-cursor": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
@@ -405,13 +371,6 @@
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
- "node_modules/regexp-to-ast": {
- "version": "0.5.0",
- "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz",
- "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==",
- "dev": true,
- "license": "MIT"
- },
"node_modules/restore-cursor": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
diff --git a/package.json b/package.json
index 39aa3006b..4b08fa81a 100644
--- a/package.json
+++ b/package.json
@@ -10,12 +10,6 @@
"devDependencies": {
"husky": "^9.1.7",
"lint-staged": "^16.2.6",
- "prettier": "^3.6.2",
- "@prettier/plugin-xml": "^3.4.2"
- },
- "prettier": {
- "plugins": [
- "@prettier/plugin-xml"
- ]
+ "prettier": "^3.6.2"
}
}
From 4c790a29584837c8876fec54fc5af0613d172a4f Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 6 Nov 2025 10:39:17 -0700
Subject: [PATCH 22/80] First attempt at coverage report
---
.github/workflows/format_and_lint.yml | 16 +++----
.github/workflows/report_kotlin_coverage.yml | 47 ++++++++++++++++++++
app/build.gradle.kts | 4 +-
3 files changed, 58 insertions(+), 9 deletions(-)
create mode 100644 .github/workflows/report_kotlin_coverage.yml
diff --git a/.github/workflows/format_and_lint.yml b/.github/workflows/format_and_lint.yml
index 484157456..9700d5dd6 100644
--- a/.github/workflows/format_and_lint.yml
+++ b/.github/workflows/format_and_lint.yml
@@ -46,11 +46,11 @@ jobs:
### Optional settings examples
- with:
- ### For a DevOps-focused repository. Prevents some code-language linters from running
- ### defaults to false
- # devops-only: false
-
- ### A regex to exclude files from linting
- ### defaults to empty
- filter-regex-exclude: src/tarpit/raw_downloads/*
+ # with:
+ ### For a DevOps-focused repository. Prevents some code-language linters from running
+ ### defaults to false
+ # devops-only: false
+
+ ### A regex to exclude files from linting
+ ### defaults to empty
+ # filter-regex-exclude:
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
new file mode 100644
index 000000000..4e645c9d5
--- /dev/null
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -0,0 +1,47 @@
+name: Measure coverage
+
+on:
+ # run anytime a PR is merged to main or a direct push to main
+ push:
+ branches: [main]
+
+ # run on any push to a PR branch
+ pull_request:
+
+ # run on demand
+ workflow_dispatch:
+ inputs:
+ custom-run-name:
+ description: "Custom name for this Actions run"
+ required: false
+ type: string
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ pull-requests: write
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up JDK
+ uses: actions/setup-java@v3
+ with:
+ distribution: "temurin"
+ java-version: "21"
+ - name: Set up Gradle
+ uses: gradle/actions/setup-gradle@v3
+ - name: Generate kover coverage report
+ run: ./gradlew koverXmlReport
+
+ - name: Add coverage report to PR
+ id: kover
+ uses: mi-kas/kover-report@v1
+ with:
+ path: |
+ ${{ github.workspace }}/project1/build/reports/kover/report.xml
+ title: Code Coverage
+ update-comment: true
+ min-coverage-overall: 80
+ min-coverage-changed-files: 80
+ coverage-counter-type: LINE
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 967417e76..94164063f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
id("kotlin-kapt")
id("com.google.devtools.ksp") version "1.9.0-1.0.13"
kotlin("plugin.serialization") version "1.9.0"
+ id("org.jetbrains.kotlinx.kover") version "0.9.3" apply false
}
android {
@@ -145,4 +146,5 @@ dependencies {
// For JSON serialisation
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
-}
\ No newline at end of file
+}
+
From b68612d788e919e395c801ae577914a8acb7e087 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 6 Nov 2025 11:25:29 -0700
Subject: [PATCH 23/80] First APK build workflow
Kover report can't function without build
---
.github/workflows/build_artifacts.yml | 78 +++++++++++++++++++++++++++
1 file changed, 78 insertions(+)
create mode 100644 .github/workflows/build_artifacts.yml
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
new file mode 100644
index 000000000..cd58194c4
--- /dev/null
+++ b/.github/workflows/build_artifacts.yml
@@ -0,0 +1,78 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Kotlin CI with Gradle
+
+on:
+ # run anytime a PR is merged to main or a direct push to main
+ push:
+ branches: [main]
+
+ # run on any push to a PR branch
+ pull_request:
+
+ # run on demand
+ workflow_dispatch:
+ inputs:
+ custom-run-name:
+ description: "Custom name for this Actions run"
+ required: false
+ type: string
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: read
+
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
+ with:
+ java-version: "21"
+ distribution: "temurin"
+
+ # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+ # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+ - name: Change wrapper permissions
+ run: chmod +x ./gradlew
+
+ - name: Build with Gradle Wrapper
+ run: ./gradlew build
+
+ # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
+ # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
+ #
+ # - name: Setup Gradle
+ # uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+ # with:
+ # gradle-version: '8.9'
+ #
+ # - name: Build with Gradle 8.9
+ # run: gradle build
+
+ dependency-submission:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: write
+
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up JDK 21
+ uses: actions/setup-java@v4
+ with:
+ java-version: "21"
+ distribution: "temurin"
+
+ # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies.
+ # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md
+ - name: Generate and submit dependency graph
+ uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
From 0460d9419160f8b9ff7175074a7f35d5414ad340 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 13:31:38 -0700
Subject: [PATCH 24/80] Config changes for usable build
Only significant change is to specify a Java toolchain (17) in the top-level build.gradle.kts file, so it doesn't implicitly use your local version
---
.gitignore | 1 +
ci_readme.txt => CI_README.md | 5 +++--
app/build.gradle.kts | 2 +-
build.gradle.kts | 10 ++++++++++
4 files changed, 15 insertions(+), 3 deletions(-)
rename ci_readme.txt => CI_README.md (59%)
diff --git a/.gitignore b/.gitignore
index 6e1af9e57..85eed698e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@ kotlin-ide/
.idea/
.aider*
.env
+.vscode/
\ No newline at end of file
diff --git a/ci_readme.txt b/CI_README.md
similarity index 59%
rename from ci_readme.txt
rename to CI_README.md
index 6e4c58969..78ccd51bb 100644
--- a/ci_readme.txt
+++ b/CI_README.md
@@ -1,4 +1,5 @@
The CI pipeline behaves as follows:
+
1. run Prettier on web-related filetypes, as well as XML
- a. Do not use prettier-plugin-kotlin, it is not maintained and errors regularly
-2. On push, run super-linter. For all possible cases, run autofix (this covers Kotlin)
\ No newline at end of file
+ a. Do not use prettier-plugin-kotlin, it is not maintained and errors regularly
+2. On push, run super-linter. For all possible cases, run autofix (this covers Kotlin)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 94164063f..61bd156ae 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
id("kotlin-kapt")
id("com.google.devtools.ksp") version "1.9.0-1.0.13"
kotlin("plugin.serialization") version "1.9.0"
- id("org.jetbrains.kotlinx.kover") version "0.9.3" apply false
+ id("org.jetbrains.kotlinx.kover") version "0.9.3"
}
android {
diff --git a/build.gradle.kts b/build.gradle.kts
index 2f6b827a8..0535f9485 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,4 +5,14 @@ plugins {
kotlin("plugin.serialization") version "1.9.0"
kotlin("jvm") version "1.9.0"
id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
+ id("org.jetbrains.kotlinx.kover") version "0.9.3" apply false
+}
+
+java {
+ toolchain {
+ // version must be at least 11,
+ // but can be any higher as source and target compatibility are
+ // both specified in app/build.gradle.kts
+ languageVersion = JavaLanguageVersion.of(17)
+ }
}
\ No newline at end of file
From 3249be44d93920eb1bb4ca726294a27e1c214007 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 13:34:19 -0700
Subject: [PATCH 25/80] PLEASE REVIEW: Minor changes to address lint build
failures
- Localize "log" to "Registre" in French
- Add constraints to activity crash screen textview
---
app/src/main/res/layout/activity_crash_screen.xml | 3 +++
app/src/main/res/values-fr-rCA/strings.xml | 1 +
2 files changed, 4 insertions(+)
diff --git a/app/src/main/res/layout/activity_crash_screen.xml b/app/src/main/res/layout/activity_crash_screen.xml
index 77e67118b..c54696358 100644
--- a/app/src/main/res/layout/activity_crash_screen.xml
+++ b/app/src/main/res/layout/activity_crash_screen.xml
@@ -16,5 +16,8 @@
android:text="TextView"
tools:layout_editor_absoluteX="13dp"
tools:layout_editor_absoluteY="14dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
/>
+
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 587725c7e..e7c73876d 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -74,4 +74,5 @@
Concurrence STA/AP
Test manuel
Réinitialiser
+ Registre
From e4ab6fae6d43be1f24c4b57c82938ce728172a01 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 13:52:37 -0700
Subject: [PATCH 26/80] Attempt to understand action failure
KoverReport failed because path to report.xml was invalid. Hopefully this commit will allow me to see the correct path so I can change the action
---
.github/workflows/report_kotlin_coverage.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index 4e645c9d5..53ae1e135 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -33,6 +33,8 @@ jobs:
uses: gradle/actions/setup-gradle@v3
- name: Generate kover coverage report
run: ./gradlew koverXmlReport
+ - name: Show directory structure
+ run: ls
- name: Add coverage report to PR
id: kover
From 92de44acb7a21319d40c80eb452e1b9f84afc180 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:02:05 -0700
Subject: [PATCH 27/80] (Hopefully) fix coverage reporting
Original workflow did not account for app folder nesting
---
.github/workflows/report_kotlin_coverage.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index 53ae1e135..9553d43dd 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -33,15 +33,13 @@ jobs:
uses: gradle/actions/setup-gradle@v3
- name: Generate kover coverage report
run: ./gradlew koverXmlReport
- - name: Show directory structure
- run: ls
- name: Add coverage report to PR
id: kover
uses: mi-kas/kover-report@v1
with:
path: |
- ${{ github.workspace }}/project1/build/reports/kover/report.xml
+ ${{ github.workspace }}/project1/app/build/reports/kover/report.xml
title: Code Coverage
update-comment: true
min-coverage-overall: 80
From 65484070760c98582ebe639691c10a8fbee60b45 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:33:45 -0700
Subject: [PATCH 28/80] Attempt to understand actions failure #2
---
.github/workflows/report_kotlin_coverage.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index 9553d43dd..4e7f34191 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -33,6 +33,8 @@ jobs:
uses: gradle/actions/setup-gradle@v3
- name: Generate kover coverage report
run: ./gradlew koverXmlReport
+ - name: Show directory structure
+ run: ls && echo "--------" && ls app/ && echo "--------" && ls app/build/
- name: Add coverage report to PR
id: kover
From 541edd37a809996bceff1d7da754646e535813ab Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:41:23 -0700
Subject: [PATCH 29/80] Attempt to understand actions failure #3
---
.github/workflows/report_kotlin_coverage.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index 4e7f34191..4225ce8f8 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -34,7 +34,7 @@ jobs:
- name: Generate kover coverage report
run: ./gradlew koverXmlReport
- name: Show directory structure
- run: ls && echo "--------" && ls app/ && echo "--------" && ls app/build/
+ run: pwd && echo "--------" && ls && echo "--------" && ls app/ && echo "--------" && ls app/build/ && echo "--------" && ls app/build/kover/reports
- name: Add coverage report to PR
id: kover
From c2ee7b2649990b128e5cd86569b49d2e3bea45d9 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 14:50:27 -0700
Subject: [PATCH 30/80] Attempt to understand actions failure #4
- Adjust path printing
- Add artifact upload action steps for build
---
.github/workflows/build_artifacts.yml | 13 +++++++++++++
.github/workflows/report_kotlin_coverage.yml | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index cd58194c4..9139abe75 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -48,6 +48,19 @@ jobs:
- name: Build with Gradle Wrapper
run: ./gradlew build
+ - name: Upload App Debug APK
+ uses: actions/upload-artifact@v4
+ with:
+ name: app-debug-apk # Optional: Name your artifact
+ path: app/build/outputs/apk/debug/app-debug.apk # Path to your build output (e.g., JARs, WARs)
+ retention-days: 5 # Optional: Set a custom retention period in days
+
+ - name: Upload App Release APK
+ uses: actions/upload-artifact@v4
+ with:
+ name: app-release-apk # Optional: Name your artifact
+ path: app/build/outputs/apk/release/app-release-unsigned.apk # Path to your build output (e.g., JARs, WARs)
+ retention-days: 1 # Optional: Set a custom retention period in days
# NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html).
# If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version.
#
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index 4225ce8f8..b569c94f2 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -34,14 +34,14 @@ jobs:
- name: Generate kover coverage report
run: ./gradlew koverXmlReport
- name: Show directory structure
- run: pwd && echo "--------" && ls && echo "--------" && ls app/ && echo "--------" && ls app/build/ && echo "--------" && ls app/build/kover/reports
+ run: pwd && echo "--------" && ls && echo "--------" && ls app/ && echo "--------" && ls app/build/ && echo "--------" && ls app/build/reports/kover
- name: Add coverage report to PR
id: kover
uses: mi-kas/kover-report@v1
with:
path: |
- ${{ github.workspace }}/project1/app/build/reports/kover/report.xml
+ ${{ github.workspace }}/app/build/reports/kover/report.xml
title: Code Coverage
update-comment: true
min-coverage-overall: 80
From dfc6b99cacffa747edd057b9e3d92f6bf4063a1b Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 15:17:56 -0700
Subject: [PATCH 31/80] Update Action names and add build comment for APKs
---
.github/workflows/build_artifacts.yml | 5 ++++-
.github/workflows/report_kotlin_coverage.yml | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index 9139abe75..b2eae7938 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -5,7 +5,8 @@
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
-name: Kotlin CI with Gradle
+name: Build APKs
+run-name: ${{ github.event.inputs.custom_run_name || github.workflow }}
on:
# run anytime a PR is merged to main or a direct push to main
@@ -30,6 +31,8 @@ jobs:
contents: read
steps:
+ - name: Notify User to Scroll
+ run: echo "Scroll to the end of the page for artifacts :arrow_down:" >> $GITHUB_STEP_SUMMARY
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index b569c94f2..acbc6eaa8 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -1,4 +1,5 @@
-name: Measure coverage
+name: Measure Test Coverage
+run-name: ${{ github.event.inputs.custom_run_name || github.workflow }}
on:
# run anytime a PR is merged to main or a direct push to main
From ac4829d3127518cc6bd0adc0f785688f605a4121 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 15:31:08 -0700
Subject: [PATCH 32/80] Improve Actions Summaries
---
.github/workflows/build_artifacts.yml | 4 +++-
.github/workflows/report_kotlin_coverage.yml | 7 ++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index b2eae7938..3d0ef416b 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -32,7 +32,9 @@ jobs:
steps:
- name: Notify User to Scroll
- run: echo "Scroll to the end of the page for artifacts :arrow_down:" >> $GITHUB_STEP_SUMMARY
+ run: |
+ echo "## Scroll to the end of the page for artifacts :arrow_down:" >> $GITHUB_STEP_SUMMARY
+ echo "---"
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index acbc6eaa8..14bfc43e4 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -34,9 +34,6 @@ jobs:
uses: gradle/actions/setup-gradle@v3
- name: Generate kover coverage report
run: ./gradlew koverXmlReport
- - name: Show directory structure
- run: pwd && echo "--------" && ls && echo "--------" && ls app/ && echo "--------" && ls app/build/ && echo "--------" && ls app/build/reports/kover
-
- name: Add coverage report to PR
id: kover
uses: mi-kas/kover-report@v1
@@ -48,3 +45,7 @@ jobs:
min-coverage-overall: 80
min-coverage-changed-files: 80
coverage-counter-type: LINE
+ - name: Add short summary to workflow run summary
+ run: |
+ echo "Overall Coverage: ${{ steps.kover.outputs.coverage-overall }}" >> $GITHUB_STEP_SUMMARY
+ echo "Changed File Coverage: ${{ steps.kover.outputs.coverage-changed-files }}" >> $GITHUB_STEP_SUMMARY
From ff87ded35ede4ee28d1e0a7768645433280dbdbc Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 15:49:26 -0700
Subject: [PATCH 33/80] Improve Actions Summaries
---
.github/workflows/build_artifacts.yml | 4 +++-
.github/workflows/report_kotlin_coverage.yml | 11 ++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index 3d0ef416b..ad98a43f6 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -34,7 +34,9 @@ jobs:
- name: Notify User to Scroll
run: |
echo "## Scroll to the end of the page for artifacts :arrow_down:" >> $GITHUB_STEP_SUMMARY
- echo "---"
+ echo "" >> $GITHUB_STEP_SUMMARY
+ echo "---" >> $GITHUB_STEP_SUMMARY
+ echo "" >> $GITHUB_STEP_SUMMARY
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index 14bfc43e4..c7b319894 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -45,7 +45,12 @@ jobs:
min-coverage-overall: 80
min-coverage-changed-files: 80
coverage-counter-type: LINE
- - name: Add short summary to workflow run summary
run: |
- echo "Overall Coverage: ${{ steps.kover.outputs.coverage-overall }}" >> $GITHUB_STEP_SUMMARY
- echo "Changed File Coverage: ${{ steps.kover.outputs.coverage-changed-files }}" >> $GITHUB_STEP_SUMMARY
+ echo "min-coverage-overall=${{ inputs.min-coverage-overall }}" >> $GITHUB_OUTPUT
+ echo "min-coverage-changed-files"=${{ inputs.min-coverage-changed-files }}" >> $GITHUB_OUTPUT"
+ - name: Add short summary to workflow run
+ run: |
+ echo "| Type | Coverage | Passing |" >> $GITHUB_STEP_SUMMARY
+ echo "|---|---|---|" >> $GITHUB_STEP_SUMMARY
+ echo "| Overall Coverage | ${{ steps.kover.outputs.coverage-overall }}% | ${{ steps.kover.outputs.coverage-overall >= steps.kover.outputs.min-coverage-overall && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
+ echo "| Changed File Coverage | ${{ steps.kover.outputs.coverage-changed-files }}% | ${{ steps.kover.outputs.coverage-changed-files >= steps.kover.outputs.min-coverage-changed-files && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
From cd6ce5f3358188ff4eb44a8657c8860cf7c4e94f Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 15:57:51 -0700
Subject: [PATCH 34/80] Add job concurrency and debug coverage workflow
---
.github/workflows/build_artifacts.yml | 5 +++++
.github/workflows/report_kotlin_coverage.yml | 20 +++++++++++++-------
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index ad98a43f6..653d435e6 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -24,6 +24,11 @@ on:
required: false
type: string
+# cancel any previously-started, yet still active runs of this workflow on the same branch
+concurrency:
+ group: ${{ github.ref }}-${{ github.workflow }}
+ cancel-in-progress: true
+
jobs:
build:
runs-on: ubuntu-latest
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index c7b319894..a31ac8d1e 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -17,6 +17,11 @@ on:
required: false
type: string
+# cancel any previously-started, yet still active runs of this workflow on the same branch
+concurrency:
+ group: ${{ github.ref }}-${{ github.workflow }}
+ cancel-in-progress: true
+
jobs:
build:
runs-on: ubuntu-latest
@@ -24,6 +29,10 @@ jobs:
contents: read
pull-requests: write
steps:
+ - name: Define Coverage Minimums
+ run: |
+ echo "min-coverage-overall=80" >> $GITHUB_ENV
+ echo "min-coverage-changed-files=80" >> $GITHUB_ENV
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
@@ -42,15 +51,12 @@ jobs:
${{ github.workspace }}/app/build/reports/kover/report.xml
title: Code Coverage
update-comment: true
- min-coverage-overall: 80
- min-coverage-changed-files: 80
+ min-coverage-overall: ${{ env.min-coverage-overall }}
+ min-coverage-changed-files: ${{ env.min-coverage-changed-files }}
coverage-counter-type: LINE
- run: |
- echo "min-coverage-overall=${{ inputs.min-coverage-overall }}" >> $GITHUB_OUTPUT
- echo "min-coverage-changed-files"=${{ inputs.min-coverage-changed-files }}" >> $GITHUB_OUTPUT"
- name: Add short summary to workflow run
run: |
echo "| Type | Coverage | Passing |" >> $GITHUB_STEP_SUMMARY
echo "|---|---|---|" >> $GITHUB_STEP_SUMMARY
- echo "| Overall Coverage | ${{ steps.kover.outputs.coverage-overall }}% | ${{ steps.kover.outputs.coverage-overall >= steps.kover.outputs.min-coverage-overall && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
- echo "| Changed File Coverage | ${{ steps.kover.outputs.coverage-changed-files }}% | ${{ steps.kover.outputs.coverage-changed-files >= steps.kover.outputs.min-coverage-changed-files && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
+ echo "| Overall Coverage | ${{ steps.kover.outputs.coverage-overall }}% | ${{ steps.kover.outputs.coverage-overall >= env.min-coverage-overall && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
+ echo "| Changed File Coverage | ${{ steps.kover.outputs.coverage-changed-files }}% | ${{ steps.kover.outputs.coverage-changed-files >= env.min-coverage-changed-files && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
From 2ce6e4e9e528e21a3deeda4089ade35d7a1df4ca Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Tue, 11 Nov 2025 16:29:48 -0700
Subject: [PATCH 35/80] Improve Action Summaries
---
.github/workflows/report_kotlin_coverage.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index a31ac8d1e..05ddd74f2 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -60,3 +60,7 @@ jobs:
echo "|---|---|---|" >> $GITHUB_STEP_SUMMARY
echo "| Overall Coverage | ${{ steps.kover.outputs.coverage-overall }}% | ${{ steps.kover.outputs.coverage-overall >= env.min-coverage-overall && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
echo "| Changed File Coverage | ${{ steps.kover.outputs.coverage-changed-files }}% | ${{ steps.kover.outputs.coverage-changed-files >= env.min-coverage-changed-files && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
+ echo "(Changed File Coverage is currently bugged, disregard)" >> $GITHUB_STEP_SUMMARY
+ echo "" >> $GITHUB_STEP_SUMMARY
+ echo "---" >> $GITHUB_STEP_SUMMARY
+ echo "" >> $GITHUB_STEP_SUMMARY
From d1f91bac9858c8c99d6df4215e116b1bdefe22a6 Mon Sep 17 00:00:00 2001
From: Jai Patel <22jaipp@gmail.com>
Date: Wed, 12 Nov 2025 14:41:35 -0700
Subject: [PATCH 36/80] Created Unit testing file specifically to test
WifiConnection.kt
---
.../components/WifiConnectionTest.kt | 127 ++++++++++++++++++
1 file changed, 127 insertions(+)
create mode 100644 app/src/test/java/com/greybox/projectmesh/components/WifiConnectionTest.kt
diff --git a/app/src/test/java/com/greybox/projectmesh/components/WifiConnectionTest.kt b/app/src/test/java/com/greybox/projectmesh/components/WifiConnectionTest.kt
new file mode 100644
index 000000000..12687ec29
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/components/WifiConnectionTest.kt
@@ -0,0 +1,127 @@
+package com.greybox.projectmesh.components
+
+import org.junit.Assert.*
+import org.junit.Test
+import java.lang.reflect.Field
+import com.ustadmobile.meshrabiya.vnet.wifi.WifiConnectConfig
+
+/**
+ * JVM-only tests for simple data + status in WifiConnection.kt.
+ * No Android/Compose/Mockito required.
+ *
+ * NOTE: We allocate a dummy WifiConnectConfig via Unsafe and NEVER call its methods.
+ * We also avoid ConnectRequest.equals()/hashCode() because that would call
+ * WifiConnectConfig.hashCode() internally (which can NPE if fields are null).
+ */
+class WifiConnectionTest {
+
+ // -----------------------------
+ // Enum: stages must exist
+ // -----------------------------
+ @Test
+ fun checkAllStatusesExist() {
+ val all = ConnectWifiLauncherStatus.values().toSet()
+ assertTrue(ConnectWifiLauncherStatus.INACTIVE in all)
+ assertTrue(ConnectWifiLauncherStatus.REQUESTING_PERMISSION in all)
+ assertTrue(ConnectWifiLauncherStatus.LOOKING_FOR_NETWORK in all)
+ assertTrue(ConnectWifiLauncherStatus.REQUESTING_LINK in all)
+ assertEquals(4, all.size)
+ }
+
+ // -----------------------------------------------
+ // Result model: failure shape must look correct
+ // -----------------------------------------------
+ @Test
+ fun checkFailureResultLooksRight() {
+ val error = Exception("expected failure")
+ val result = ConnectWifiLauncherResult(
+ hotspotConfig = null,
+ exception = error,
+ isWifiConnected = false
+ )
+ assertFalse(result.isWifiConnected)
+ assertNull(result.hotspotConfig)
+ assertNotNull(result.exception)
+ assertEquals("expected failure", result.exception?.message)
+ }
+
+ // -------------------------------------------------------
+ // Result model: data-class copy/equals/hashCode sanity
+ // (safe because hotspotConfig = null)
+ // -------------------------------------------------------
+ @Test
+ fun checkResultCopiesAndComparesCorrectly() {
+ val first = ConnectWifiLauncherResult(
+ hotspotConfig = null,
+ exception = Exception("boom"),
+ isWifiConnected = false
+ )
+ val same = first.copy()
+ val different = first.copy(exception = Exception("other"))
+
+ assertEquals(first, same)
+ assertEquals(first.hashCode(), same.hashCode())
+ assertNotEquals(first, different)
+ }
+
+ // =========================================
+ // ConnectRequest: JVM tests (no Mockito)
+ // Avoid equals()/hashCode() on the whole object.
+ // =========================================
+
+ @Test
+ fun connectRequest_defaultTimeIsZero() {
+ val cfg = unsafeInstance()
+ val req = ConnectRequest(connectConfig = cfg)
+ assertEquals(0L, req.receivedTime)
+ assertSame(cfg, req.connectConfig) // same reference
+ }
+
+ @Test
+ fun connectRequest_customTimePreserved() {
+ val cfg = unsafeInstance()
+ val req = ConnectRequest(receivedTime = 123456789L, connectConfig = cfg)
+ assertEquals(123456789L, req.receivedTime)
+ assertSame(cfg, req.connectConfig)
+ }
+
+ @Test
+ fun connectRequest_copyPreservesConfigAndChangesTime() {
+ val cfg = unsafeInstance()
+ val original = ConnectRequest(receivedTime = 100L, connectConfig = cfg)
+ val copiedSame = original.copy()
+ val copiedChanged = original.copy(receivedTime = 200L)
+
+ // field-wise checks (no equals()/hashCode())
+ assertEquals(100L, copiedSame.receivedTime)
+ assertSame(cfg, copiedSame.connectConfig)
+
+ assertEquals(200L, copiedChanged.receivedTime)
+ assertSame(cfg, copiedChanged.connectConfig)
+
+ // sanity: copies are distinct instances
+ assertNotSame(original, copiedSame)
+ assertNotSame(original, copiedChanged)
+ }
+
+ // -------------------------------------------------------
+ // Tiny Unsafe helper for constructor-less allocation
+ // -------------------------------------------------------
+ @Suppress("UNCHECKED_CAST")
+ private inline fun unsafeInstance(): T {
+ val unsafe = getUnsafe()
+ val allocate = unsafe.javaClass.getMethod("allocateInstance", Class::class.java)
+ return allocate.invoke(unsafe, T::class.java) as T
+ }
+
+ private fun getUnsafe(): Any {
+ val clazz = try {
+ Class.forName("sun.misc.Unsafe")
+ } catch (_: ClassNotFoundException) {
+ Class.forName("jdk.internal.misc.Unsafe")
+ }
+ val f: Field = clazz.getDeclaredField("theUnsafe")
+ f.isAccessible = true
+ return f.get(null)
+ }
+}
From e624eff582c9a23b02c1729b8067f5c12b0ca489 Mon Sep 17 00:00:00 2001
From: Jai Patel <22jaipp@gmail.com>
Date: Wed, 12 Nov 2025 15:36:27 -0700
Subject: [PATCH 37/80] Created Unit testing file specifically to test
WifiConnection.kt
---
.../projectmesh/db/MeshDatabaseTest.kt | 54 +++++++++++++++++++
1 file changed, 54 insertions(+)
create mode 100644 app/src/test/java/com/greybox/projectmesh/db/MeshDatabaseTest.kt
diff --git a/app/src/test/java/com/greybox/projectmesh/db/MeshDatabaseTest.kt b/app/src/test/java/com/greybox/projectmesh/db/MeshDatabaseTest.kt
new file mode 100644
index 000000000..e8d812006
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/db/MeshDatabaseTest.kt
@@ -0,0 +1,54 @@
+package com.greybox.projectmesh.db
+
+import org.junit.Assert.*
+import org.junit.Test
+import java.lang.reflect.Modifier
+import com.greybox.projectmesh.messaging.data.dao.MessageDao
+import com.greybox.projectmesh.messaging.data.dao.ConversationDao
+import com.greybox.projectmesh.user.UserDao
+import androidx.room.RoomDatabase
+
+/**
+ * JVM-only tests for MeshDatabase class shape.
+ * These do NOT spin up Room or touch Android runtime.
+ *
+ * We verify:
+ * - MeshDatabase is abstract
+ * - MeshDatabase extends RoomDatabase
+ * - Required DAO methods exist and have the correct return types
+ *
+ * Anything involving entities, queries, schema, and migrations belongs
+ * in src/androidTest with an in-memory RoomDatabase.
+ */
+class MeshDatabaseTest {
+
+ @Test
+ fun meshDatabase_isAbstract_and_extendsRoomDatabase() {
+ val cls = MeshDatabase::class.java
+
+ // Must be abstract
+ assertTrue("MeshDatabase must be abstract",
+ Modifier.isAbstract(cls.modifiers))
+
+ // Must extend androidx.room.RoomDatabase
+ assertTrue("MeshDatabase must extend RoomDatabase",
+ RoomDatabase::class.java.isAssignableFrom(cls))
+ }
+
+ @Test
+ fun meshDatabase_has_requiredDaoMethods_with_correctReturnTypes() {
+ val cls = MeshDatabase::class.java
+
+ // messageDao(): MessageDao
+ val messageDaoMethod = cls.getMethod("messageDao")
+ assertEquals(MessageDao::class.java, messageDaoMethod.returnType)
+
+ // userDao(): UserDao
+ val userDaoMethod = cls.getMethod("userDao")
+ assertEquals(UserDao::class.java, userDaoMethod.returnType)
+
+ // conversationDao(): ConversationDao
+ val conversationDaoMethod = cls.getMethod("conversationDao")
+ assertEquals(ConversationDao::class.java, conversationDaoMethod.returnType)
+ }
+}
From 67360c0adb47992759f526479d3a9fe6eb84b9d1 Mon Sep 17 00:00:00 2001
From: Jai Patel <22jaipp@gmail.com>
Date: Wed, 12 Nov 2025 15:58:41 -0700
Subject: [PATCH 38/80] Created Unit testing file specifically to test
WifiConnection.kt
---
.../projectmesh/debug/CrashHandlerTest.kt | 88 +++++++++++++++++++
1 file changed, 88 insertions(+)
create mode 100644 app/src/test/java/com/greybox/projectmesh/debug/CrashHandlerTest.kt
diff --git a/app/src/test/java/com/greybox/projectmesh/debug/CrashHandlerTest.kt b/app/src/test/java/com/greybox/projectmesh/debug/CrashHandlerTest.kt
new file mode 100644
index 000000000..f9a18bf26
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/debug/CrashHandlerTest.kt
@@ -0,0 +1,88 @@
+package com.greybox.projectmesh.debug
+
+import com.google.gson.Gson
+import org.junit.Assert.*
+import org.junit.Test
+import java.lang.Thread.UncaughtExceptionHandler
+
+/**
+ * JVM-only tests for CrashHandler.
+ * We DO NOT invoke Android runtime (no Context/Intent usage at runtime).
+ * All checks are reflection-based and safe for plain JVM.
+ */
+class CrashHandlerTest {
+
+ /**
+ * CrashHandler must implement Thread.UncaughtExceptionHandler.
+ * (If someone removes/changes this, we catch it early.)
+ */
+ @Test
+ fun crashHandler_implements_UncaughtExceptionHandler() {
+ assertTrue(
+ UncaughtExceptionHandler::class.java.isAssignableFrom(CrashHandler::class.java)
+ )
+ }
+
+ /**
+ * Verify the primary constructor shape:
+ * (Context, UncaughtExceptionHandler, Class<*>)
+ * We don't instantiate anything; we only look up the signature.
+ */
+ @Test
+ fun crashHandler_has_expected_constructor_signature() {
+ val ctx = android.content.Context::class.java
+ val ueh = UncaughtExceptionHandler::class.java
+ val klass = Class::class.java
+
+ // If the constructor is missing or signature changes, this throws NoSuchMethodException
+ val ctor = CrashHandler::class.java.getDeclaredConstructor(ctx, ueh, klass)
+ assertNotNull(ctor)
+ }
+
+ /**
+ * Companion must expose:
+ * - init(Context, Class<*>)
+ * - getThrowableFromIntent(Intent): Throwable?
+ * We assert presence and parameter/return types by reflection.
+ */
+ @Test
+ fun companion_has_init_and_getThrowableFromIntent_signatures() {
+ // Access the Kotlin "Companion" object using plain Java reflection.
+ val companionField = CrashHandler::class.java.getDeclaredField("Companion")
+ companionField.isAccessible = true
+ val companion = companionField.get(null)
+ ?: throw AssertionError("CrashHandler must have a companion object")
+
+ val companionClass = companion::class.java
+
+ // init(Context, Class<*>)
+ val ctx = android.content.Context::class.java
+ val klass = Class::class.java
+ val initMethod = companionClass.getMethod("init", ctx, klass)
+ assertEquals(Void.TYPE, initMethod.returnType)
+
+ // getThrowableFromIntent(Intent): Throwable?
+ val intent = android.content.Intent::class.java
+ val getMethod = companionClass.getMethod("getThrowableFromIntent", intent)
+ assertTrue(Throwable::class.java.isAssignableFrom(getMethod.returnType))
+ // Nullable return can't be asserted at runtime; we only check the declared type.
+ }
+
+ /**
+ * Sanity: the Gson strategy (JSON round-trip) works in general.
+ * We DON'T use Throwable here because JDK 17+ blocks reflective access
+ * to its internal fields, which causes JsonIOException.
+ * Real Throwable JSON handling will be validated in instrumented tests.
+ */
+ @Test
+ fun gson_can_roundtrip_simple_crash_payload() {
+ data class CrashPayload(val message: String)
+
+ val gson = Gson()
+ val original = CrashPayload("crash-demo")
+ val json = gson.toJson(original)
+ val parsed = gson.fromJson(json, CrashPayload::class.java)
+
+ assertEquals("crash-demo", parsed.message)
+ }
+}
From c28cc89eafccc7a9febf3cf4b16f282803d384a1 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Wed, 12 Nov 2025 22:47:09 -0700
Subject: [PATCH 39/80] Remove redundant read override and add tests for
InputStreamCounter
Deleted the unnecessary override of read(ByteArray) in InputStreamCounter, relying on the existing read(ByteArray, Int, Int) implementation for byte counting. Added unit tests for InputStreamCounter to verify byte counting and closed state behavior.
---
.gitignore | 2 +
.../projectmesh/server/InputStreamCounter.kt | 7 --
.../server/InputStreamCounterTest.kt | 83 +++++++++++++++++++
3 files changed, 85 insertions(+), 7 deletions(-)
create mode 100644 app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
diff --git a/.gitignore b/.gitignore
index 6e1af9e57..3e0c6f4d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,5 @@ kotlin-ide/
.idea/
.aider*
.env
+.vscode/settings.json
+.idea/misc.xml
diff --git a/app/src/main/java/com/greybox/projectmesh/server/InputStreamCounter.kt b/app/src/main/java/com/greybox/projectmesh/server/InputStreamCounter.kt
index 256ba9422..df4821c7c 100644
--- a/app/src/main/java/com/greybox/projectmesh/server/InputStreamCounter.kt
+++ b/app/src/main/java/com/greybox/projectmesh/server/InputStreamCounter.kt
@@ -22,13 +22,6 @@ class InputStreamCounter(
}
}
- override fun read(b: ByteArray): Int {
- return super.read(b).also {
- if(it != -1)
- bytesRead += it
- }
- }
-
override fun read(b: ByteArray, off: Int, len: Int): Int {
return super.read(b, off, len).also {
if(it != -1)
diff --git a/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt b/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
new file mode 100644
index 000000000..2e6c71fdd
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
@@ -0,0 +1,83 @@
+package com.greybox.projectmesh.server
+
+import org.junit.Assert.*
+import org.junit.Test
+import java.io.ByteArrayInputStream
+
+class InputStreamCounterTest {
+
+ @Test
+ fun readSingleBytes_countsAllBytes() {
+ val data = "hello world".toByteArray()
+ val input = ByteArrayInputStream(data)
+ val counter = InputStreamCounter(input)
+
+ while (true) {
+ val result = counter.read()
+ if (result == -1) break
+ }
+
+ assertEquals(data.size, counter.bytesRead)
+ assertFalse(counter.closed)
+ }
+
+ @Test
+ fun readIntoBuffer_countsAllBytes() {
+ val data = ByteArray(4096) { it.toByte() }
+ val input = ByteArrayInputStream(data)
+ val counter = InputStreamCounter(input)
+
+ val buffer = ByteArray(1024)
+ while (true) {
+ val n = counter.read(buffer)
+ if (n == -1) break
+ }
+
+ assertEquals(data.size, counter.bytesRead)
+ }
+
+ @Test
+ fun readWithOffset_countsAllBytes() {
+ val data = "abcdefghi".toByteArray()
+ val input = ByteArrayInputStream(data)
+ val counter = InputStreamCounter(input)
+
+ val buffer = ByteArray(10)
+ while (true) {
+ val n = counter.read(buffer, 1, 4)
+ if (n == -1) break
+ }
+
+ assertEquals(data.size, counter.bytesRead)
+ }
+
+ @Test
+ fun bytesRead_doesNotIncreaseAfterEof() {
+ val data = "test".toByteArray()
+ val input = ByteArrayInputStream(data)
+ val counter = InputStreamCounter(input)
+
+ val buffer = ByteArray(2)
+ while (counter.read(buffer) != -1) {
+ }
+
+ val before = counter.bytesRead
+ val eofRead = counter.read(buffer)
+
+ assertEquals(-1, eofRead)
+ assertEquals(before, counter.bytesRead)
+ }
+
+ @Test
+ fun close_setsClosedFlag() {
+ val data = "xyz".toByteArray()
+ val input = ByteArrayInputStream(data)
+ val counter = InputStreamCounter(input)
+
+ assertFalse(counter.closed)
+
+ counter.close()
+
+ assertTrue(counter.closed)
+ }
+}
\ No newline at end of file
From 597de63520e7e5096cbcf18758f7c7e7774b1c3f Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Thu, 13 Nov 2025 03:21:45 -0700
Subject: [PATCH 40/80] Add ListExtensionTest and rename InputStreamCounterTest
methods
Introduced ListExtensionTest to cover updateItem extension function with various scenarios. Renamed test methods in InputStreamCounterTest for improved clarity and consistency.
---
.../extension/ListExtensionTest.kt | 70 +++++++++++++++++++
.../server/InputStreamCounterTest.kt | 10 +--
2 files changed, 75 insertions(+), 5 deletions(-)
create mode 100644 app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt
diff --git a/app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt b/app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt
new file mode 100644
index 000000000..4ad24eec8
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt
@@ -0,0 +1,70 @@
+package com.greybox.projectmesh.extension
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class ListExtensionTest {
+
+ @Test
+ fun checkUpdateFirstItem() {
+ val list = listOf(1, 2, 3, 4)
+ val updated = list.updateItem(
+ condition = { it % 2 == 0 },
+ function = { it * 10 }
+ )
+
+ assertEquals(listOf(1, 20, 3, 4), updated)
+ }
+
+ @Test
+ fun checkOnlyFirstMatch() {
+ val list = listOf(2, 4, 6)
+ val updated = list.updateItem(
+ condition = { it % 2 == 0 },
+ function = { it * 10 }
+ )
+
+ assertEquals(listOf(20, 4, 6), updated)
+ }
+
+ @Test
+ fun checkNoMatch() {
+ val list = listOf(1, 3, 5)
+ val updated = list.updateItem(
+ condition = { it % 2 == 0 },
+ function = { it * 10 }
+ )
+
+ assertSame(list, updated)
+ assertEquals(listOf(1, 3, 5), updated)
+ }
+
+ @Test
+ fun checkEmptyList() {
+ val list = emptyList()
+ val updated = list.updateItem(
+ condition = { true },
+ function = { it * 10 }
+ )
+
+ assertSame(list, updated)
+ assertTrue(updated.isEmpty())
+ }
+
+ @Test
+ fun checkCallingFunctionNoMatch() {
+ val list = listOf(1, 3, 5)
+ var called = false
+
+ val updated = list.updateItem(
+ condition = { it % 2 == 0 },
+ function = {
+ called = true
+ it * 10
+ }
+ )
+
+ assertFalse(called)
+ assertSame(list, updated)
+ }
+}
diff --git a/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt b/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
index 2e6c71fdd..094151a6b 100644
--- a/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
+++ b/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
@@ -7,7 +7,7 @@ import java.io.ByteArrayInputStream
class InputStreamCounterTest {
@Test
- fun readSingleBytes_countsAllBytes() {
+ fun countSingleBytes() {
val data = "hello world".toByteArray()
val input = ByteArrayInputStream(data)
val counter = InputStreamCounter(input)
@@ -22,7 +22,7 @@ class InputStreamCounterTest {
}
@Test
- fun readIntoBuffer_countsAllBytes() {
+ fun readBufferBytes() {
val data = ByteArray(4096) { it.toByte() }
val input = ByteArrayInputStream(data)
val counter = InputStreamCounter(input)
@@ -37,7 +37,7 @@ class InputStreamCounterTest {
}
@Test
- fun readWithOffset_countsAllBytes() {
+ fun countOffsetBytes() {
val data = "abcdefghi".toByteArray()
val input = ByteArrayInputStream(data)
val counter = InputStreamCounter(input)
@@ -52,7 +52,7 @@ class InputStreamCounterTest {
}
@Test
- fun bytesRead_doesNotIncreaseAfterEof() {
+ fun checkEOF() {
val data = "test".toByteArray()
val input = ByteArrayInputStream(data)
val counter = InputStreamCounter(input)
@@ -69,7 +69,7 @@ class InputStreamCounterTest {
}
@Test
- fun close_setsClosedFlag() {
+ fun checkClose() {
val data = "xyz".toByteArray()
val input = ByteArrayInputStream(data)
val counter = InputStreamCounter(input)
From d6ad974b73f36e94ad32fb372240f0f104a11586 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Thu, 13 Nov 2025 11:12:19 -0700
Subject: [PATCH 41/80] Add unit tests for ConversationUtils
Introduces ConversationUtilsTest to verify conversation ID creation logic, including handling of identical UUIDs and special cases for device UUIDs.
---
.../messaging/utils/ConversationUtilsTest.kt | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt
diff --git a/app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt b/app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt
new file mode 100644
index 000000000..8e5b2470e
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt
@@ -0,0 +1,34 @@
+package com.greybox.projectmesh.messaging.utils
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class ConversationUtilsTest {
+
+ @Test
+ fun checkCreateConversationId() {
+ val id1 = ConversationUtils.createConversationId("a", "b")
+ val id2 = ConversationUtils.createConversationId("b", "a")
+
+ assertEquals("a-b", id1)
+ assertEquals(id1, id2)
+ }
+
+ @Test
+ fun checkIdenticalUuids() {
+ val id = ConversationUtils.createConversationId("same", "same")
+ assertEquals("same-same", id)
+ }
+
+ @Test
+ fun checkSpecialCase() {
+ val id = ConversationUtils.createConversationId("anything", "test-device-uuid")
+ assertEquals("local-user-test-device-uuid", id)
+ }
+
+ @Test
+ fun checkSecondSpecialCase() {
+ val id = ConversationUtils.createConversationId("anything", "offline-test-device-uuid")
+ assertEquals("local-user-offline-test-device-uuid", id)
+ }
+}
From d3250d32a2ce41a80645f99e5fe0cf9a5d9fb994 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Thu, 13 Nov 2025 11:25:27 -0700
Subject: [PATCH 42/80] Add detailed comments to test classes
Added descriptive block and section comments to ListExtensionTest, ConversationUtilsTest, and InputStreamCounterTest to clarify test coverage, intent, and expected behaviors for JVM-only extension and utility functions. Improves maintainability and understanding of test cases.
---
.../extension/ListExtensionTest.kt | 27 ++++++++++++++++++-
.../messaging/utils/ConversationUtilsTest.kt | 22 +++++++++++++++
.../server/InputStreamCounterTest.kt | 26 ++++++++++++++++++
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt b/app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt
index 4ad24eec8..e00d0f4ad 100644
--- a/app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt
+++ b/app/src/test/java/com/greybox/projectmesh/extension/ListExtensionTest.kt
@@ -3,8 +3,21 @@ package com.greybox.projectmesh.extension
import org.junit.Assert.*
import org.junit.Test
+/**
+ * JVM-only tests for List.updateItem extension.
+ *
+ * Verifies:
+ * - first matching item is updated
+ * - only the first match is changed
+ * - lists with no match return the same instance
+ * - empty lists behave correctly
+ * - update function is not invoked when no match exists
+ */
class ListExtensionTest {
+ // --------------------------------------
+ // First match: should update first match
+ // --------------------------------------
@Test
fun checkUpdateFirstItem() {
val list = listOf(1, 2, 3, 4)
@@ -16,6 +29,9 @@ class ListExtensionTest {
assertEquals(listOf(1, 20, 3, 4), updated)
}
+ // ---------------------------------------------------
+ // Only first matching item should be transformed once
+ // ---------------------------------------------------
@Test
fun checkOnlyFirstMatch() {
val list = listOf(2, 4, 6)
@@ -27,6 +43,9 @@ class ListExtensionTest {
assertEquals(listOf(20, 4, 6), updated)
}
+ // -------------------------------------------------
+ // No match: must return same list instance unchanged
+ // -------------------------------------------------
@Test
fun checkNoMatch() {
val list = listOf(1, 3, 5)
@@ -39,6 +58,9 @@ class ListExtensionTest {
assertEquals(listOf(1, 3, 5), updated)
}
+ // ---------------------------
+ // Empty list stays unchanged
+ // ---------------------------
@Test
fun checkEmptyList() {
val list = emptyList()
@@ -51,6 +73,9 @@ class ListExtensionTest {
assertTrue(updated.isEmpty())
}
+ // -------------------------------------------------------
+ // No match: function should not be executed even once
+ // -------------------------------------------------------
@Test
fun checkCallingFunctionNoMatch() {
val list = listOf(1, 3, 5)
@@ -67,4 +92,4 @@ class ListExtensionTest {
assertFalse(called)
assertSame(list, updated)
}
-}
+}
\ No newline at end of file
diff --git a/app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt b/app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt
index 8e5b2470e..d5370c5a1 100644
--- a/app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt
+++ b/app/src/test/java/com/greybox/projectmesh/messaging/utils/ConversationUtilsTest.kt
@@ -3,8 +3,20 @@ package com.greybox.projectmesh.messaging.utils
import org.junit.Assert.*
import org.junit.Test
+/**
+ * JVM-only tests for ConversationUtils.createConversationId.
+ *
+ * Verifies:
+ * - stable ordering of UUID pairs
+ * - identical UUIDs produce expected ID
+ * - special-case handling for device UUIDs
+ * - offline device UUIDs follow same special rule
+ */
class ConversationUtilsTest {
+ // ----------------------------------------
+ // Ordering: "a","b" should equal "b","a"
+ // ----------------------------------------
@Test
fun checkCreateConversationId() {
val id1 = ConversationUtils.createConversationId("a", "b")
@@ -14,18 +26,28 @@ class ConversationUtilsTest {
assertEquals(id1, id2)
}
+ // --------------------------------------
+ // Identical values should join naturally
+ // --------------------------------------
@Test
fun checkIdenticalUuids() {
val id = ConversationUtils.createConversationId("same", "same")
assertEquals("same-same", id)
}
+ // -----------------------------------------------------
+ // Special rule: remote UUID "test-device-uuid" maps to
+ // "local-user-"
+ // -----------------------------------------------------
@Test
fun checkSpecialCase() {
val id = ConversationUtils.createConversationId("anything", "test-device-uuid")
assertEquals("local-user-test-device-uuid", id)
}
+ // -----------------------------------------------------
+ // Offline device rule: mirrors test-device behavior
+ // -----------------------------------------------------
@Test
fun checkSecondSpecialCase() {
val id = ConversationUtils.createConversationId("anything", "offline-test-device-uuid")
diff --git a/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt b/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
index 094151a6b..3e15809e2 100644
--- a/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
+++ b/app/src/test/java/com/greybox/projectmesh/server/InputStreamCounterTest.kt
@@ -4,8 +4,21 @@ import org.junit.Assert.*
import org.junit.Test
import java.io.ByteArrayInputStream
+/**
+ * JVM-only tests for InputStreamCounter.
+ *
+ * Verifies:
+ * - single-byte reads
+ * - buffered reads
+ * - offset reads
+ * - EOF behavior
+ * - close() flag
+ */
class InputStreamCounterTest {
+ // -----------------------------------------
+ // Single-byte read: should count each byte
+ // -----------------------------------------
@Test
fun countSingleBytes() {
val data = "hello world".toByteArray()
@@ -21,6 +34,9 @@ class InputStreamCounterTest {
assertFalse(counter.closed)
}
+ // ----------------------------------------------------------
+ // Buffered read: reading in chunks should count total bytes
+ // ----------------------------------------------------------
@Test
fun readBufferBytes() {
val data = ByteArray(4096) { it.toByte() }
@@ -36,6 +52,9 @@ class InputStreamCounterTest {
assertEquals(data.size, counter.bytesRead)
}
+ // ----------------------------------------------------------------
+ // Offset read: read(buffer, off, len) must still count accurately
+ // ----------------------------------------------------------------
@Test
fun countOffsetBytes() {
val data = "abcdefghi".toByteArray()
@@ -51,6 +70,9 @@ class InputStreamCounterTest {
assertEquals(data.size, counter.bytesRead)
}
+ // ---------------------------------------------------------
+ // EOF behavior: read after EOF should return -1 and not add
+ // ---------------------------------------------------------
@Test
fun checkEOF() {
val data = "test".toByteArray()
@@ -59,6 +81,7 @@ class InputStreamCounterTest {
val buffer = ByteArray(2)
while (counter.read(buffer) != -1) {
+ // consume all data
}
val before = counter.bytesRead
@@ -68,6 +91,9 @@ class InputStreamCounterTest {
assertEquals(before, counter.bytesRead)
}
+ // --------------------------
+ // close(): should set flag
+ // --------------------------
@Test
fun checkClose() {
val data = "xyz".toByteArray()
From 922c607852c8c5f82709abdf248cd4e7ef960d70 Mon Sep 17 00:00:00 2001
From: Thalia Wood <42354895+polygeist111@users.noreply.github.com>
Date: Thu, 13 Nov 2025 19:52:17 -0700
Subject: [PATCH 43/80] Correct artifact expiration period
---
.github/workflows/build_artifacts.yml | 2 +-
.github/workflows/report_kotlin_coverage.yml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index 653d435e6..539c3d202 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -65,7 +65,7 @@ jobs:
with:
name: app-debug-apk # Optional: Name your artifact
path: app/build/outputs/apk/debug/app-debug.apk # Path to your build output (e.g., JARs, WARs)
- retention-days: 5 # Optional: Set a custom retention period in days
+ retention-days: 1 # Optional: Set a custom retention period in days
- name: Upload App Release APK
uses: actions/upload-artifact@v4
diff --git a/.github/workflows/report_kotlin_coverage.yml b/.github/workflows/report_kotlin_coverage.yml
index 05ddd74f2..b011d3411 100644
--- a/.github/workflows/report_kotlin_coverage.yml
+++ b/.github/workflows/report_kotlin_coverage.yml
@@ -60,6 +60,7 @@ jobs:
echo "|---|---|---|" >> $GITHUB_STEP_SUMMARY
echo "| Overall Coverage | ${{ steps.kover.outputs.coverage-overall }}% | ${{ steps.kover.outputs.coverage-overall >= env.min-coverage-overall && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
echo "| Changed File Coverage | ${{ steps.kover.outputs.coverage-changed-files }}% | ${{ steps.kover.outputs.coverage-changed-files >= env.min-coverage-changed-files && ':white_check_mark:' || ':x:' }} |" >> $GITHUB_STEP_SUMMARY
+ echo "" >> $GITHUB_STEP_SUMMARY
echo "(Changed File Coverage is currently bugged, disregard)" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "---" >> $GITHUB_STEP_SUMMARY
From 31f7046f160e11ec9477e97aa145325bb655b4ea Mon Sep 17 00:00:00 2001
From: Jai Patel <22jaipp@gmail.com>
Date: Sat, 22 Nov 2025 19:01:43 -0700
Subject: [PATCH 44/80] Created Unit more testing files for multiple files
---
.../debug/CrashScreenActivityTest.kt | 44 +++++++++
.../projectmesh/navigation/BottomNavTest.kt | 90 +++++++++++++++++++
.../navigation/NavigationItemTest.kt | 45 ++++++++++
.../projectmesh/ui/theme/ThemeLayerTest.kt | 77 ++++++++++++++++
4 files changed, 256 insertions(+)
create mode 100644 app/src/test/java/com/greybox/projectmesh/debug/CrashScreenActivityTest.kt
create mode 100644 app/src/test/java/com/greybox/projectmesh/navigation/BottomNavTest.kt
create mode 100644 app/src/test/java/com/greybox/projectmesh/navigation/NavigationItemTest.kt
create mode 100644 app/src/test/java/com/greybox/projectmesh/ui/theme/ThemeLayerTest.kt
diff --git a/app/src/test/java/com/greybox/projectmesh/debug/CrashScreenActivityTest.kt b/app/src/test/java/com/greybox/projectmesh/debug/CrashScreenActivityTest.kt
new file mode 100644
index 000000000..4e09e27f2
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/debug/CrashScreenActivityTest.kt
@@ -0,0 +1,44 @@
+package com.greybox.projectmesh.debug
+
+import android.content.Intent
+import com.google.gson.Gson
+import org.junit.Assert.*
+import org.junit.Test
+
+class CrashScreenActivityTest {
+
+ @Test
+ fun getThrowableFromIntent_returnsThrowable_whenValidJsonProvided() {
+ // SAFE: minimal JSON, avoids Gson reflection into private fields.
+ val json = """{"detailMessage":"boom-crash"}"""
+
+ val intent = Intent().apply {
+ putExtra("CrashData", json)
+ }
+
+ val parsed = CrashHandler.getThrowableFromIntent(intent)
+
+ assertNotNull(parsed)
+ assertEquals("boom-crash", parsed?.message)
+ }
+
+ @Test
+ fun getThrowableFromIntent_returnsNull_whenInvalidJsonProvided() {
+ val intent = Intent().apply {
+ putExtra("CrashData", "{invalid-json}")
+ }
+
+ val parsed = CrashHandler.getThrowableFromIntent(intent)
+
+ assertNull(parsed)
+ }
+
+ @Test
+ fun getThrowableFromIntent_returnsNull_whenNoCrashDataProvided() {
+ val intent = Intent()
+
+ val parsed = CrashHandler.getThrowableFromIntent(intent)
+
+ assertNull(parsed)
+ }
+}
diff --git a/app/src/test/java/com/greybox/projectmesh/navigation/BottomNavTest.kt b/app/src/test/java/com/greybox/projectmesh/navigation/BottomNavTest.kt
new file mode 100644
index 000000000..6fad19e40
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/navigation/BottomNavTest.kt
@@ -0,0 +1,90 @@
+package com.greybox.projectmesh.navigation
+
+import org.junit.Assert.*
+import org.junit.Test
+
+/**
+ * JVM unit tests for the BottomNavItem sealed class.
+ *
+ * We only check pure data:
+ * - each object has the expected route and title
+ * - all routes are unique
+ * - icons are present (non-null references)
+ *
+ * No Compose runtime or Android APIs are used here, so this is safe
+ * as a local unit test.
+ */
+class BottomNavItemTest {
+
+ private val allItems = listOf(
+ BottomNavItem.Home,
+ BottomNavItem.Network,
+ BottomNavItem.Send,
+ BottomNavItem.Receive,
+ BottomNavItem.Log,
+ BottomNavItem.Settings,
+ BottomNavItem.Chat
+ )
+
+ @Test
+ fun allItems_haveExpectedRoutesAndTitles() {
+ // route, title pairs we expect
+ val expected = mapOf(
+ BottomNavItem.Home to ("home" to "Home"),
+ BottomNavItem.Network to ("network" to "Network"),
+ BottomNavItem.Send to ("send" to "Send"),
+ BottomNavItem.Receive to ("receive" to "Receive"),
+ BottomNavItem.Log to ("log" to "Log"),
+ BottomNavItem.Settings to ("settings" to "Settings"),
+ BottomNavItem.Chat to ("chat" to "Chat"),
+ )
+
+ for (item in allItems) {
+ val (expRoute, expTitle) = expected[item]
+ ?: error("Missing expectations for $item")
+
+ assertEquals("Wrong route for ${item::class.simpleName}", expRoute, item.route)
+ assertEquals("Wrong title for ${item::class.simpleName}", expTitle, item.title)
+ }
+ }
+
+ @Test
+ fun allItems_haveNonNullIcons() {
+ allItems.forEach { item ->
+ assertNotNull(
+ "Icon must not be null for ${item::class.simpleName}",
+ item.icon
+ )
+ }
+ }
+
+ @Test
+ fun routes_areUniqueAcrossAllItems() {
+ val routes = allItems.map { it.route }
+ val distinctRoutes = routes.toSet()
+
+ assertEquals(
+ "Each BottomNavItem should use a unique route",
+ distinctRoutes.size,
+ routes.size
+ )
+ }
+
+ @Test
+ fun sealedHierarchy_containsExactlyExpectedItems() {
+ // This guards against someone adding a new object without updating tests.
+ val classes = allItems.map { it::class.simpleName }.toSet()
+
+ val expectedNames = setOf(
+ "Home",
+ "Network",
+ "Send",
+ "Receive",
+ "Log",
+ "Settings",
+ "Chat"
+ )
+
+ assertEquals(expectedNames, classes)
+ }
+}
diff --git a/app/src/test/java/com/greybox/projectmesh/navigation/NavigationItemTest.kt b/app/src/test/java/com/greybox/projectmesh/navigation/NavigationItemTest.kt
new file mode 100644
index 000000000..d82e1ced5
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/navigation/NavigationItemTest.kt
@@ -0,0 +1,45 @@
+package com.greybox.projectmesh.navigation
+
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+import org.junit.Assert.*
+import org.junit.Test
+
+/**
+ * JVM unit tests for the NavigationItem data class.
+ *
+ * NOTE:
+ * - Composables & NavController CANNOT be JVM tested.
+ * - We only verify that NavigationItem behaves as a proper
+ * Kotlin data class (copy, equals, hashCode).
+ */
+class NavigationItemTest {
+
+ // Just need some non-null ImageVector instance
+ private val dummyIcon: ImageVector = ImageVector.Builder(
+ defaultWidth = 24.dp, // <-- Dp, not Float
+ defaultHeight = 24.dp, // <-- Dp, not Float
+ viewportWidth = 24f,
+ viewportHeight = 24f
+ ).build()
+
+ @Test
+ fun navigationItem_copyEqualsHashCodeCorrect() {
+ val original = NavigationItem(
+ route = "home",
+ label = "Home",
+ icon = dummyIcon
+ )
+
+ val copy = original.copy()
+ val modified = original.copy(route = "different")
+
+ // Same data → equal
+ assertEquals(original, copy)
+ assertEquals(original.hashCode(), copy.hashCode())
+
+ // Different route → not equal
+ assertNotEquals(original, modified)
+ assertEquals("different", modified.route)
+ }
+}
diff --git a/app/src/test/java/com/greybox/projectmesh/ui/theme/ThemeLayerTest.kt b/app/src/test/java/com/greybox/projectmesh/ui/theme/ThemeLayerTest.kt
new file mode 100644
index 000000000..e1cd7c5ff
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/ui/theme/ThemeLayerTest.kt
@@ -0,0 +1,77 @@
+package com.greybox.projectmesh.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import org.junit.Assert.*
+import org.junit.Test
+
+/**
+ * JVM unit tests for the theme layer:
+ *
+ * - Color constants in Color.kt
+ * - AppTheme enum in Theme.kt
+ * - Typography definition in Type.kt
+ *
+ * NOTE:
+ * - We do NOT run the ProjectMeshTheme composable here,
+ * because that requires a real Compose runtime / Android.
+ * - Instrumented tests will check the actual MaterialTheme
+ * behavior (dark/light, system theme, etc.).
+ */
+class ThemeLayerTest {
+
+ // -----------------------------
+ // Color constants (Color.kt)
+ // -----------------------------
+
+ @Test
+ fun colors_haveExpectedArgbValues() {
+ // Light variants
+ assertEquals(Color(0xFFD0BCFF), Purple80)
+ assertEquals(Color(0xFFCCC2DC), PurpleGrey80)
+ assertEquals(Color(0xFFEFB8C8), Pink80)
+
+ // Darker variants
+ assertEquals(Color(0xFF6650A4), Purple40)
+ assertEquals(Color(0xFF625B71), PurpleGrey40)
+ assertEquals(Color(0xFF7D5260), Pink40)
+ }
+
+ // -----------------------------
+ // AppTheme enum (Theme.kt)
+ // -----------------------------
+
+ @Test
+ fun appTheme_containsExpectedValuesInOrder() {
+ val values = enumValues().toList()
+
+ assertEquals(3, values.size)
+ assertEquals(AppTheme.SYSTEM, values[0])
+ assertEquals(AppTheme.LIGHT, values[1])
+ assertEquals(AppTheme.DARK, values[2])
+
+ val names = values.map { it.name }.toSet()
+ assertEquals(setOf("SYSTEM", "LIGHT", "DARK"), names)
+ }
+
+ // -----------------------------
+ // Typography (Type.kt)
+ // -----------------------------
+
+ @Test
+ fun typography_bodyLarge_hasExpectedDefaults() {
+ // Typography is the object defined in Type.kt
+ val body = Typography.bodyLarge
+
+ // Font family & weight
+ assertEquals(FontFamily.Default, body.fontFamily)
+ assertEquals(FontWeight.Normal, body.fontWeight)
+
+ // Sizes (we compare the .value floats for simplicity)
+ assertEquals(16f, body.fontSize.value, 0.0f)
+ assertEquals(24f, body.lineHeight.value, 0.0f)
+ assertEquals(0.5f, body.letterSpacing.value, 0.0f)
+ }
+}
From b8aad94a7aec3ba3d2c6c77729b06e865a127290 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 24 Nov 2025 18:07:25 -0700
Subject: [PATCH 45/80] Added 4 new test files
Added tests for FileEncoder, Logger, MessageMigrationUtils and MessageUtils
---
.idea/misc.xml | 2 +
.../messaging/data/entities/FileEncoder.kt | 84 ++++++++++---------
.../projectmesh/messaging/utils/Logger.kt | 27 ++++--
.../messaging/utils/MessageMigrationUtils.kt | 2 +-
.../data/entities/FileEncoderTest.kt | 49 +++++++++++
.../projectmesh/messaging/utils/LoggerTest.kt | 31 +++++++
.../utils/MessageMigrationUtilsTest.kt | 52 ++++++++++++
.../messaging/utils/MessageUtilsTest.kt | 41 +++++++++
8 files changed, 237 insertions(+), 51 deletions(-)
create mode 100644 app/src/test/java/com/greybox/projectmesh/messaging/data/entities/FileEncoderTest.kt
create mode 100644 app/src/test/java/com/greybox/projectmesh/messaging/utils/LoggerTest.kt
create mode 100644 app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtilsTest.kt
create mode 100644 app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageUtilsTest.kt
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0bd3ec25a..74dd639e4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,6 @@
+
+
diff --git a/app/src/main/java/com/greybox/projectmesh/messaging/data/entities/FileEncoder.kt b/app/src/main/java/com/greybox/projectmesh/messaging/data/entities/FileEncoder.kt
index 25bcfbf44..f21a25e9e 100644
--- a/app/src/main/java/com/greybox/projectmesh/messaging/data/entities/FileEncoder.kt
+++ b/app/src/main/java/com/greybox/projectmesh/messaging/data/entities/FileEncoder.kt
@@ -53,68 +53,70 @@ import java.net.URL
import java.net.URLConnection
import java.net.URLDecoder
-//Use this to encode files not just images
-//Needs to be tested sometime
-//Can I modify this so that Http transfer does the majority of the encoding?
-class FileEncoder {//Made by Craig. Encodes via base64.
+class FileEncoder {
@OptIn(ExperimentalEncodingApi::class)
- fun encodebase64(ctxt: Context, inputuri: Uri): String?{
- try {
+ fun encodebase64(ctxt: Context, inputuri: Uri): String? {
+ return try {
val encodedstrm: InputStream? = ctxt.contentResolver.openInputStream(inputuri)
val bytes = encodedstrm?.readBytes()
encodedstrm?.close()
- return if (bytes != null) {
- Base64.encode(bytes)
- } else {
- "Cannot encode file"
- }
- } catch(e: Exception){
+ encodeBytesBase64(bytes)
+ } catch (e: Exception) {
e.printStackTrace()
- return "Cannot encode file"}
+ "Cannot encode file"
+ }
+ }
+ @OptIn(ExperimentalEncodingApi::class)
+ internal fun encodeBytesBase64(bytes: ByteArray?): String? {
+ return if (bytes != null) {
+ Base64.encode(bytes)
+ } else {
+ "Cannot encode file"
+ }
}
- @OptIn(ExperimentalEncodingApi::class)//Made by Craig
- fun decodeBase64(inputbase64:String, output: File): File{//Decodes to a file. Uses base64
+ @OptIn(ExperimentalEncodingApi::class)
+ fun decodeBase64(inputbase64: String, output: File): File {
val decodedfilebytes = Base64.decode(inputbase64)
val decodedstrm = FileOutputStream(output)
decodedstrm.write(decodedfilebytes)
decodedstrm.close()
return output
}
- fun sendImage(imageURI: Uri?, tgtaddress: InetAddress, tgtport:Int, appctxt: Context): Boolean{//Testing sending images
- try{//we can utilize this if we opt not to use JSON
- if(imageURI != null){
- val fp = encodebase64(appctxt, imageURI)//encodes file to base64
- if(!fp.equals("Cannot encode file")) {
- val efp = URLEncoder.encode(fp, "UTF-8")//ensures that the file URI is utf-8 encoded
- val connection =
- URL("http://${tgtaddress.hostAddress}:${tgtport}/upload?file=$efp").openConnection() as HttpURLConnection
- val request = "POST"//Specifies the request as a POST
- connection.doOutput = true
- connection.requestMethod = request
- connection.setChunkedStreamingMode(0)
- val instream = appctxt.contentResolver.openInputStream(imageURI)
- val outstream = connection.outputStream
- val readingbuffer = ByteArray(1024)
- var finishedreading: Int
- while (instream?.read(readingbuffer).also { finishedreading = it!! } != -1) {
- outstream.write(readingbuffer, 0, finishedreading)
- }
- outstream.close()
- instream?.close()
+ fun sendImage(imageURI: Uri?, tgtaddress: InetAddress, tgtport: Int, appctxt: Context): Boolean {
+ try {
+ if (imageURI != null) {
+ val fp = encodebase64(appctxt, imageURI)
+ if (!fp.equals("Cannot encode file")) {
+ val efp = URLEncoder.encode(fp, "UTF-8")
+ val connection =
+ URL("http://${tgtaddress.hostAddress}:${tgtport}/upload?file=$efp").openConnection() as HttpURLConnection
+ val request = "POST"
+ connection.doOutput = true
+ connection.requestMethod = request
+ connection.setChunkedStreamingMode(0)
+ val instream = appctxt.contentResolver.openInputStream(imageURI)
+ val outstream = connection.outputStream
+ val readingbuffer = ByteArray(1024)
+ var finishedreading: Int
+ while (instream?.read(readingbuffer).also { finishedreading = it!! } != -1) {
+ outstream.write(readingbuffer, 0, finishedreading)
+ }
+ outstream.close()
+ instream?.close()
+ } else {
+ return false
+ }
} else {
return false
- }} else {
- return false
}
- }
- catch(e: Exception){
+ } catch (e: Exception) {
e.printStackTrace()
return false
}
return true
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/greybox/projectmesh/messaging/utils/Logger.kt b/app/src/main/java/com/greybox/projectmesh/messaging/utils/Logger.kt
index 9000bc113..871374a87 100644
--- a/app/src/main/java/com/greybox/projectmesh/messaging/utils/Logger.kt
+++ b/app/src/main/java/com/greybox/projectmesh/messaging/utils/Logger.kt
@@ -8,43 +8,52 @@ import android.util.Log
*/
object Logger {
+ internal const val TAG_PREFIX = "MeshChat_"
private const val LOGGING_ENABLED = true
- private const val TAG_PREFIX = "MeshChat_"
+
+ internal fun buildTag(tag: String): String {
+ return "$TAG_PREFIX$tag"
+ }
+
+ internal fun buildCriticalTag(tag: String): String {
+ return "${TAG_PREFIX}${tag}_CRITICAL"
+ }
fun d(tag: String, message: String) {
if (LOGGING_ENABLED) {
- Log.d("$TAG_PREFIX$tag", message)
+ Log.d(buildTag(tag), message)
}
}
fun i(tag: String, message: String) {
if (LOGGING_ENABLED) {
- Log.i("$TAG_PREFIX$tag", message)
+ Log.i(buildTag(tag), message)
}
}
fun w(tag: String, message: String) {
if (LOGGING_ENABLED) {
- Log.w("$TAG_PREFIX$tag", message)
+ Log.w(buildTag(tag), message)
}
}
fun e(tag: String, message: String, throwable: Throwable? = null) {
if (LOGGING_ENABLED) {
if (throwable != null) {
- Log.e("$TAG_PREFIX$tag", message, throwable)
+ Log.e(buildTag(tag), message, throwable)
} else {
- Log.e("$TAG_PREFIX$tag", message)
+ Log.e(buildTag(tag), message)
}
}
}
// Log important events that should be visible even in production
fun critical(tag: String, message: String, throwable: Throwable? = null) {
+ val criticalTag = buildCriticalTag(tag)
if (throwable != null) {
- Log.e("$TAG_PREFIX${tag}_CRITICAL", message, throwable)
+ Log.e(criticalTag, message, throwable)
} else {
- Log.e("$TAG_PREFIX${tag}_CRITICAL", message)
+ Log.e(criticalTag, message)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtils.kt b/app/src/main/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtils.kt
index a2bb342f4..22e10dcdf 100644
--- a/app/src/main/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtils.kt
+++ b/app/src/main/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtils.kt
@@ -93,7 +93,7 @@ class MessageMigrationUtils(
}
}
- private fun createConversationId(uuid1: String, uuid2: String): String {
+ internal fun createConversationId(uuid1: String, uuid2: String): String {
// Special cases for test devices
if (uuid2 == "test-device-uuid") {
return "local-user-test-device-uuid"
diff --git a/app/src/test/java/com/greybox/projectmesh/messaging/data/entities/FileEncoderTest.kt b/app/src/test/java/com/greybox/projectmesh/messaging/data/entities/FileEncoderTest.kt
new file mode 100644
index 000000000..1cef20f3c
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/messaging/data/entities/FileEncoderTest.kt
@@ -0,0 +1,49 @@
+package com.greybox.projectmesh.messaging.data.entities
+
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.io.File
+
+class FileEncoderTest {
+
+ private val encoder = FileEncoder()
+
+ @Test
+ fun encodeBytesBase64_encodesNonNullBytes() {
+ val original = "hello".toByteArray()
+ val result = encoder.encodeBytesBase64(original)
+ assertEquals("aGVsbG8=", result)
+ }
+
+ @Test
+ fun encodeBytesBase64_returnsErrorMessageForNullBytes() {
+ val result = encoder.encodeBytesBase64(null)
+ assertEquals("Cannot encode file", result)
+ }
+
+ @Test
+ fun decodeBase64_writesDecodedBytesToFile() {
+ val base64 = "aGVsbG8="
+ val tempFile = File.createTempFile("fileencoder_test", ".bin")
+ tempFile.deleteOnExit()
+
+ encoder.decodeBase64(base64, tempFile)
+
+ val content = tempFile.readBytes()
+ assertArrayEquals("hello".toByteArray(), content)
+ }
+
+ @Test
+ fun decodeBase64_overwritesExistingFileContent() {
+ val tempFile = File.createTempFile("fileencoder_overwrite_test", ".bin")
+ tempFile.writeText("old-content")
+ tempFile.deleteOnExit()
+
+ val base64 = "aGVsbG8="
+ encoder.decodeBase64(base64, tempFile)
+
+ val content = tempFile.readBytes()
+ assertArrayEquals("hello".toByteArray(), content)
+ }
+}
diff --git a/app/src/test/java/com/greybox/projectmesh/messaging/utils/LoggerTest.kt b/app/src/test/java/com/greybox/projectmesh/messaging/utils/LoggerTest.kt
new file mode 100644
index 000000000..cef18e398
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/messaging/utils/LoggerTest.kt
@@ -0,0 +1,31 @@
+package com.greybox.projectmesh.utils
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class LoggerTest {
+
+ @Test
+ fun buildTag_prefixesWithMeshChat() {
+ val result = Logger.buildTag("ChatScreen")
+ assertEquals("MeshChat_ChatScreen", result)
+ }
+
+ @Test
+ fun buildTag_handlesEmptyTag() {
+ val result = Logger.buildTag("")
+ assertEquals("MeshChat_", result)
+ }
+
+ @Test
+ fun buildCriticalTag_appendsCriticalSuffix() {
+ val result = Logger.buildCriticalTag("Network")
+ assertEquals("MeshChat_Network_CRITICAL", result)
+ }
+
+ @Test
+ fun buildCriticalTag_handlesEmptyTag() {
+ val result = Logger.buildCriticalTag("")
+ assertEquals("MeshChat__CRITICAL", result)
+ }
+}
diff --git a/app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtilsTest.kt b/app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtilsTest.kt
new file mode 100644
index 000000000..9dde1d24b
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageMigrationUtilsTest.kt
@@ -0,0 +1,52 @@
+package com.greybox.projectmesh.messaging.utils
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.kodein.di.DI
+
+class MessageMigrationUtilsTest {
+
+ private val di = DI {}
+ private val utils = MessageMigrationUtils(di)
+
+ @Test
+ fun createConversationId_sortsNormalUuids() {
+ val uuid1 = "b-uuid"
+ val uuid2 = "a-uuid"
+
+ val result = utils.createConversationId(uuid1, uuid2)
+
+ assertEquals("a-uuid-b-uuid", result)
+ }
+
+ @Test
+ fun createConversationId_handlesTestDeviceUuid() {
+ val uuid1 = "some-other-uuid"
+ val uuid2 = "test-device-uuid"
+
+ val result = utils.createConversationId(uuid1, uuid2)
+
+ assertEquals("local-user-test-device-uuid", result)
+ }
+
+ @Test
+ fun createConversationId_handlesOfflineTestDeviceUuid() {
+ val uuid1 = "some-other-uuid"
+ val uuid2 = "offline-test-device-uuid"
+
+ val result = utils.createConversationId(uuid1, uuid2)
+
+ assertEquals("local-user-offline-test-device-uuid", result)
+ }
+
+ @Test
+ fun createConversationId_isDeterministicForSamePair() {
+ val uuidA = "1111-aaaa"
+ val uuidB = "2222-bbbb"
+
+ val id1 = utils.createConversationId(uuidA, uuidB)
+ val id2 = utils.createConversationId(uuidB, uuidA)
+
+ assertEquals(id1, id2)
+ }
+}
diff --git a/app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageUtilsTest.kt b/app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageUtilsTest.kt
new file mode 100644
index 000000000..f69ad567c
--- /dev/null
+++ b/app/src/test/java/com/greybox/projectmesh/messaging/utils/MessageUtilsTest.kt
@@ -0,0 +1,41 @@
+package com.greybox.projectmesh.messaging.utils
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import java.util.TimeZone
+
+class MessageUtilsTest {
+
+ @Test
+ fun formatTimestamp_formatsToHoursAndMinutesInUtc() {
+ val originalTimeZone = TimeZone.getDefault()
+ try {
+ TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
+ val timestamp = 0L
+ val result = MessageUtils.formatTimestamp(timestamp)
+ assertEquals("00:00", result)
+ } finally {
+ TimeZone.setDefault(originalTimeZone)
+ }
+ }
+
+ @Test
+ fun generateChatId_isOrderIndependent() {
+ val id1 = MessageUtils.generateChatId("alice", "bob")
+ val id2 = MessageUtils.generateChatId("bob", "alice")
+ assertEquals("alice-bob", id1)
+ assertEquals(id1, id2)
+ }
+
+ @Test
+ fun generateChatId_handlesSameUser() {
+ val id = MessageUtils.generateChatId("alice", "alice")
+ assertEquals("alice-alice", id)
+ }
+
+ @Test
+ fun generateChatId_isCaseSensitive() {
+ val id = MessageUtils.generateChatId("Alice", "alice")
+ assertEquals("Alice-alice", id)
+ }
+}
From d3ae06529b850a5025e64f0191bd231580fa58a6 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 1 Dec 2025 19:34:19 -0700
Subject: [PATCH 46/80] Created InputStreamCounter.puml
---
uml/class-diagrams/InputStreamCounter.puml | 27 ++++++++++++++++++++++
1 file changed, 27 insertions(+)
create mode 100644 uml/class-diagrams/InputStreamCounter.puml
diff --git a/uml/class-diagrams/InputStreamCounter.puml b/uml/class-diagrams/InputStreamCounter.puml
new file mode 100644
index 000000000..514b607a1
--- /dev/null
+++ b/uml/class-diagrams/InputStreamCounter.puml
@@ -0,0 +1,27 @@
+@startuml InputStreamCounter
+
+package "java.io" {
+ class InputStream
+ class FilterInputStream {
+ - in: InputStream
+ + read(): int
+ + read(b: byte[], off: int, len: int): int
+ + close(): void
+ }
+ FilterInputStream --> InputStream
+}
+
+package "com.greybox.projectmesh.server" {
+ class InputStreamCounter extends FilterInputStream {
+ + bytesRead: Int
+ + closed: Boolean
+
+ + read(): Int
+ + read(b: ByteArray, off: Int, len: Int): Int
+ + close(): Void
+ }
+}
+
+InputStreamCounter --> InputStream : wraps
+
+@enduml
From 9befe75289f61bca00d0a841fde51ab446ade884 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 1 Dec 2025 19:36:04 -0700
Subject: [PATCH 47/80] Created ListExtension.puml
---
uml/class-diagrams/ListExtension.puml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 uml/class-diagrams/ListExtension.puml
diff --git a/uml/class-diagrams/ListExtension.puml b/uml/class-diagrams/ListExtension.puml
new file mode 100644
index 000000000..9fd60c6b6
--- /dev/null
+++ b/uml/class-diagrams/ListExtension.puml
@@ -0,0 +1,24 @@
+@startuml ListExtension
+
+package "kotlin.collections" {
+ interface List {
+ + indexOfFirst(predicate): Int
+ + toMutableList(): MutableList
+ }
+
+ interface MutableList extends List {
+ + set(index: Int, value)
+ + toList(): List
+ }
+}
+
+package "com.greybox.projectmesh.extension" {
+ class ListExtension {
+ <>
+ + updateItem(condition, function): List
+ }
+}
+
+ListExtension ..> List : extends functionality
+
+@enduml
From 8817deffb4af1b054e3ae5e1d310ddef88073f0f Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 1 Dec 2025 19:38:01 -0700
Subject: [PATCH 48/80] Created ConversationUtils.puml
---
uml/class-diagrams/ConversationUtils.puml | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 uml/class-diagrams/ConversationUtils.puml
diff --git a/uml/class-diagrams/ConversationUtils.puml b/uml/class-diagrams/ConversationUtils.puml
new file mode 100644
index 000000000..694c47533
--- /dev/null
+++ b/uml/class-diagrams/ConversationUtils.puml
@@ -0,0 +1,18 @@
+@startuml ConversationUtils
+
+package "com.greybox.projectmesh.messaging.utils" {
+
+ object ConversationUtils {
+ + createConversationId(uuid1: String, uuid2: String): String
+ }
+}
+
+note right of ConversationUtils
+ - Handles ordering of UUID pairs
+ - Applies special cases:
+ * "test-device-uuid"
+ * "offline-test-device-uuid"
+ - Ensures stable conversation IDs
+end note
+
+@enduml
From fcfaf286411b848047dd818a5ebeda63958a2982 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 1 Dec 2025 19:40:26 -0700
Subject: [PATCH 49/80] Created FileEncoder.puml
---
uml/class-diagrams/FileEncoder.puml | 45 +++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 uml/class-diagrams/FileEncoder.puml
diff --git a/uml/class-diagrams/FileEncoder.puml b/uml/class-diagrams/FileEncoder.puml
new file mode 100644
index 000000000..ca523053e
--- /dev/null
+++ b/uml/class-diagrams/FileEncoder.puml
@@ -0,0 +1,45 @@
+@startuml FileEncoder
+
+package "com.greybox.projectmesh.messaging.data.entities" {
+
+ class FileEncoder {
+
+ + encodebase64(ctxt: Context, inputuri: Uri): String
+ + encodeBytesBase64(bytes: ByteArray): String
+ + decodeBase64(inputbase64: String, output: File): File
+ + sendImage(imageURI: Uri, tgtaddress: InetAddress, tgtport: Int, appctxt: Context): Boolean
+ }
+}
+
+package "android.content" {
+ class Context
+}
+
+package "android.net" {
+ class Uri
+}
+
+package "java.io" {
+ class File
+}
+
+package "java.net" {
+ class InetAddress
+}
+
+FileEncoder --> Context
+FileEncoder --> Uri
+FileEncoder --> File
+FileEncoder --> InetAddress
+
+note right of FileEncoder
+ - Encodes file content to Base64
+ - Decodes Base64 back into a File
+ - Sends image data over HTTP
+ - Used by FileEncoderTest to verify:
+ * correct Base64 encoding
+ * null handling
+ * file overwrite behavior
+end note
+
+@enduml
From d4c7f6cbca582031846d0497f039f6f786473044 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 1 Dec 2025 19:41:51 -0700
Subject: [PATCH 50/80] Created Logger.puml
---
uml/class-diagrams/Logger.puml | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 uml/class-diagrams/Logger.puml
diff --git a/uml/class-diagrams/Logger.puml b/uml/class-diagrams/Logger.puml
new file mode 100644
index 000000000..860b6bc0d
--- /dev/null
+++ b/uml/class-diagrams/Logger.puml
@@ -0,0 +1,34 @@
+@startuml Logger
+
+package "com.greybox.projectmesh.utils" {
+
+ object Logger {
+
+ - LOGGING_ENABLED: Boolean
+ + TAG_PREFIX: String
+
+ + buildTag(tag: String): String
+ + buildCriticalTag(tag: String): String
+
+ + d(tag: String, message: String)
+ + i(tag: String, message: String)
+ + w(tag: String, message: String)
+ + e(tag: String, message: String, throwable: Throwable)
+ + critical(tag: String, message: String, throwable: Throwable)
+ }
+}
+
+package "android.util" {
+ class Log
+}
+
+Logger --> Log : uses
+
+note right of Logger
+ - Centralized logging utility
+ - Builds standardized tags
+ - Supports debug/info/warn/error logging
+ - Special critical logging always visible
+end note
+
+@enduml
From ec12fe01f9a74389443be8451807869b0d559b5e Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 1 Dec 2025 19:43:39 -0700
Subject: [PATCH 51/80] Created MessageMigrationUtils.puml
---
uml/class-diagrams/MessageMigrationUtils.puml | 42 +++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100644 uml/class-diagrams/MessageMigrationUtils.puml
diff --git a/uml/class-diagrams/MessageMigrationUtils.puml b/uml/class-diagrams/MessageMigrationUtils.puml
new file mode 100644
index 000000000..9195084d5
--- /dev/null
+++ b/uml/class-diagrams/MessageMigrationUtils.puml
@@ -0,0 +1,42 @@
+@startuml MessageMigrationUtils
+
+package "org.kodein.di" {
+ interface DIAware
+ class DI
+}
+
+package "com.greybox.projectmesh.db" {
+ class MeshDatabase
+}
+
+package "com.greybox.projectmesh" {
+ class GlobalApp
+}
+
+package "com.greybox.projectmesh.testing" {
+ class TestDeviceService
+}
+
+package "android.util" {
+ class Log
+}
+
+package "com.greybox.projectmesh.messaging.utils" {
+
+ class MessageMigrationUtils implements DIAware {
+
+ - db: MeshDatabase
+
+ + MessageMigrationUtils(di: DI)
+ + migrateMessagesToChatIds()
+ + createConversationId(uuid1: String, uuid2: String): String
+ }
+}
+
+MessageMigrationUtils --> DI : injected via DI
+MessageMigrationUtils --> MeshDatabase : uses
+MessageMigrationUtils --> GlobalApp : reads user/prefs
+MessageMigrationUtils --> TestDeviceService : special names
+MessageMigrationUtils --> Log : logging
+
+@enduml
From da7317e0a051041bd6753c1a3773a14d16d2f6a3 Mon Sep 17 00:00:00 2001
From: taimuradam
Date: Mon, 1 Dec 2025 19:44:26 -0700
Subject: [PATCH 52/80] Created MessageUtils.puml
---
uml/class-diagrams/MessageUtils.puml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 uml/class-diagrams/MessageUtils.puml
diff --git a/uml/class-diagrams/MessageUtils.puml b/uml/class-diagrams/MessageUtils.puml
new file mode 100644
index 000000000..1e309e8a9
--- /dev/null
+++ b/uml/class-diagrams/MessageUtils.puml
@@ -0,0 +1,24 @@
+@startuml MessageUtils
+
+package "com.greybox.projectmesh.messaging.utils" {
+
+ object MessageUtils {
+
+ + formatTimestamp(timestamp: Long): String
+ + generateChatId(sender: String, receiver: String): String
+ }
+}
+
+package "java.text" {
+ class SimpleDateFormat
+}
+
+MessageUtils --> SimpleDateFormat : uses
+
+note right of MessageUtils
+ - Formats timestamps as "HH:mm"
+ - Generates consistent chat IDs
+ - Sorting ensures order independence
+end note
+
+@enduml
From b67861dbae3853428469cedbba509f2969b0f406 Mon Sep 17 00:00:00 2001
From: Jai Patel <22jaipp@gmail.com>
Date: Sun, 1 Feb 2026 19:37:08 -0700
Subject: [PATCH 53/80] Created Unit more testing files for multiple files
---
uml/class-diagrams/HomeScreenViewModel.png | Bin 0 -> 300114 bytes
uml/class-diagrams/bottomnav.puml | 85 ++++++++++
uml/class-diagrams/crashhandler.puml | 72 ++++++++
uml/class-diagrams/crashscreenactivity.puml | 83 +++++++++
uml/class-diagrams/database.puml | 79 +++++++++
uml/class-diagrams/homescreen.puml | 172 +++++++++++++++++++
uml/class-diagrams/mvvm.puml | 177 ++++++++++++++++++++
uml/class-diagrams/navitem.puml | 66 ++++++++
uml/class-diagrams/ui_theme1.puml | 85 ++++++++++
uml/class-diagrams/usecase.puml | 62 +++++++
uml/class-diagrams/wificonnecction.puml | 97 +++++++++++
11 files changed, 978 insertions(+)
create mode 100644 uml/class-diagrams/HomeScreenViewModel.png
create mode 100644 uml/class-diagrams/bottomnav.puml
create mode 100644 uml/class-diagrams/crashhandler.puml
create mode 100644 uml/class-diagrams/crashscreenactivity.puml
create mode 100644 uml/class-diagrams/database.puml
create mode 100644 uml/class-diagrams/homescreen.puml
create mode 100644 uml/class-diagrams/mvvm.puml
create mode 100644 uml/class-diagrams/navitem.puml
create mode 100644 uml/class-diagrams/ui_theme1.puml
create mode 100644 uml/class-diagrams/usecase.puml
create mode 100644 uml/class-diagrams/wificonnecction.puml
diff --git a/uml/class-diagrams/HomeScreenViewModel.png b/uml/class-diagrams/HomeScreenViewModel.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e4606d7c1e9fd92f72887ca240be6a83a3e81a7
GIT binary patch
literal 300114
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