Merge Debug build type by ForbiddenKiwis · Pull Request #41 · grey-box/Project-Mesh

ForbiddenKiwis · 2025-06-25T19:18:01Z

Includes Features like:

New Debug Build Type
Timber Custom Logging which shows the Logs when in Debug and Hides when in release
Hides Log Tab When in Debug Mode
Refactored all the Logs into Timber.Log

- Created messaging package structure - Moved message-related code to dedicated files - Added proper documentation - Improved code organization and maintainability

…irst push

Created button for chat screen as well as the chat screen itself. Changes to files: MainActivity.kt BottomNavHost.kt BottomNavItem.kt strings.xml(All versions)

Fix for the app crashing when the IP field in chat is empty

…based chat selection - Removed the old text field + button approach in the Chat route - Introduced ChatNodeListScreen to display nodes from NetworkScreenViewModel - Users now tap a node to navigate to the existing ChatScreen

Added message bubble feature to the chat screen. work done in ChatScreen.kt

…thub.com/grey-box/Project-Mesh into messaging-updates-wil-mesh-asu-cidse2024

…reuse - Relocated WifiListItem composable to `com.greybox.projectmesh.extension.WifiListItem` - Removed old definitions from NetworkScreen and replaced them with imports of the new utility - Updated ChatNodeListScreen and NetworkScreen to reference the shared component - Ensures a single source of UI truth for node listing and improves code maintainability

Fixed the issue of the app crashing when message were being sent.

Deleted line that was for some reason added, wasn't in the latest version so unsure where it came from.

Added different colors for message bubbles based on whether or not a message is sent by the user, or being received by the user.

- Add test device infrastructure for chat testing - Create mock virtual router and logger - Implement test device in network screen - Add basic test device appearance in chat list This allows testing of chat functionality without requiring a second physical device.

…ing build issues.

…dpoint - Added OnboardingViewModel storing typed device name in both userRepository (DB) and SharedPreferences - Created custom ViewModelProvider.Factory to avoid no-arg constructor crash in Onboarding - Updated AppServer with /myinfo route + requestRemoteUserInfo() to retrieve remote user’s name - Replaced DeviceInfoManager calls with userRepository-based lookups (DB approach) - Settings screen now reads + displays the typed device name (shared DB/prefs) - Currently not calling requestRemoteUserInfo() automatically; will add usage in next commit

…idse2024' into messaging-updates-wil-mesh-asu-cidse2024 # Conflicts: # app/src/main/java/com/greybox/projectmesh/MainActivity.kt # app/src/main/java/com/greybox/projectmesh/messaging/ui/screens/ChatScreen.kt

- Updated SettingsScreen to trigger onDeviceNameChange when a new device name is submitted. - Modified the onDeviceNameChange callback to: • Retrieve the local UUID from SharedPreferences. • Update the local user in the database via UserRepository.insertOrUpdateUser. • Query connected users (via getAllConnectedUsers) from the repository and iterate over each user’s IP address. • For each connected node, convert the IP to InetAddress and call appServer.pushUserInfoTo to broadcast the updated user info. - Added detailed logging for debugging the update and broadcast processes. - Refactored the broadcast mechanism to reuse existing user repository data instead of maintaining a separate global list.

Deleted some old test code from ChatScreen.kt

- Fixed onboarding screen bug so it only shows on first startup by properly setting/checking the hasRunBefore flag. - Refactored OnboardingViewModel to use DI-provided local IP from AndroidVirtualNode. - Updated user info update logic (get user info and update) to store clean user names and IP separately. - Improved messaging logic to avoid appending the IP to the user name.

-Added time stamps to the bottom right of message bubbles.

-created conversation entity for tracking chat history -implement conversationdao and repository for data management -added ConversationHomeScreens UI with online/offline indicators - update navigation - integrate history with existing chat screen and user profiles - added support for offline messaging history - improved UX with status indicators and unread counts - modified to 2 test users: one online and one offline

…ting app git status ! make sure to clear data on app before running this git status

…TTP Post Was originally being sent via HTTP GET which has some problems.

…ld-Type # Conflicts: # app/src/main/java/com/greybox/projectmesh/messaging/network/MessageNetworkHandler.kt # app/src/main/java/com/greybox/projectmesh/navigation/BottomNavHost.kt

app/src/main/java/com/greybox/projectmesh/MainActivity.kt

app/src/main/AndroidManifest.xml

app/build.gradle.kts

taimuradam

It looks good, I have proposed 3 small changes in app/src/main/java/com/greybox/projectmesh/MainActivity.kt (line 97), app/src/main/AndroidManifest.xml (line 86) and app/build.gradle.kts (line 33).

procrastinator007

Looks good my comments should summarize that all file changes were appropriate and consistent. In some of them there where unnecessary cleanup or lines that were added which was not so necessary but at the same time, it doesn't affect the functionality of the code and is ready to be pushed on to the main branch as long as it has been tested on a android physical device to see if the logger is setup correctly. emulator looks good.

procrastinator007 · 2026-04-06T21:29:07Z

.gitignore

looks good no problem

procrastinator007 · 2026-04-06T21:34:19Z

app/build.gradle.kts

Setup of debug functionality looks good and categorised

procrastinator007 · 2026-04-06T21:36:04Z

app/src/main/java/com/greybox/projectmesh/MNetLoggerAndroid.kt

Timber logging added appropriately replacing the older version

procrastinator007 · 2026-04-06T21:36:50Z

app/src/main/java/com/greybox/projectmesh/MainActivity.kt

consistent changes made

procrastinator007 · 2026-04-06T21:54:02Z

app/src/main/java/com/greybox/projectmesh/messaging/network/MessageNetworkHandler.kt

consistent changes made

procrastinator007 · 2026-04-06T21:57:19Z

app/src/main/java/com/greybox/projectmesh/viewModel/NetworkScreenViewModel.kt

consistent changes made

procrastinator007 · 2026-04-06T21:57:29Z

app/src/main/java/com/greybox/projectmesh/viewModel/OnboardingViewModel.kt

consistent changes made

procrastinator007 · 2026-04-06T21:57:41Z

app/src/main/java/com/greybox/projectmesh/viewModel/SelectDestNodeScreenViewModel.kt

consistent changes made

procrastinator007 · 2026-04-06T21:57:55Z

app/src/main/java/com/greybox/projectmesh/views/ReceiveScreen.kt

consistent changes made

procrastinator007 · 2026-04-06T21:58:34Z

app/src/main/java/com/greybox/projectmesh/MainActivity.kt

timber has been added appropriately

ccameron-gb · 2026-04-07T00:19:28Z

@Kteja03 Can you try running this on your Android device? You'll need to build the debug build and check the log option on the app (we think this exists?). You might get more help from here: https://www.notion.so/grey-box/Build-variants-and-what-they-do-217815ddf30b807caeb8eaed05a6e0f6

ccoppo and others added 30 commits February 2, 2025 12:19

refactor: Reorganize messaging functionality into dedicated module

48fa2c3

- Created messaging package structure - Moved message-related code to dedicated files - Added proper documentation - Improved code organization and maintainability

refactor: fixing oops some files did not get committed/pushed in my f…

c339d96

…irst push

Added Craig's chat screen

67a52e2

Created button for chat screen as well as the chat screen itself. Changes to files: MainActivity.kt BottomNavHost.kt BottomNavItem.kt strings.xml(All versions)

Fix for app crashing when IP field empty

ce1a236

Fix for the app crashing when the IP field in chat is empty

Added Messaging Bubbles

071c595

Added message bubble feature to the chat screen. work done in ChatScreen.kt

Added the file encoder class

8658411

Merge branch 'messaging-updates-wil-mesh-asu-cidse2024' of https://gi…

57d2c7d

…thub.com/grey-box/Project-Mesh into messaging-updates-wil-mesh-asu-cidse2024

Fixed functionality for sending text messages

f8a5250

Fixed the issue of the app crashing when message were being sent.

Fixing issue in gradle.xml

826c5f3

Deleted line that was for some reason added, wasn't in the latest version so unsure where it came from.

Added colors for message bubles

674b206

Added different colors for message bubbles based on whether or not a message is sent by the user, or being received by the user.

Added the file encoder class

9942d78

Added the file encoder class

b73fe91

commented out some of the changes to the Message class that were caus…

aa1ecab

…ing build issues.

Merge remote-tracking branch 'origin/messaging-updates-wil-mesh-asu-c…

56cd348

…idse2024' into messaging-updates-wil-mesh-asu-cidse2024 # Conflicts: # app/src/main/java/com/greybox/projectmesh/MainActivity.kt # app/src/main/java/com/greybox/projectmesh/messaging/ui/screens/ChatScreen.kt

feat: fixed merge issues

bbf18a3

feat: fixed merge issues with the test device

8ee6a10

Cleaned up ChatScreen.kt

9be7ec1

Deleted some old test code from ChatScreen.kt

Added time stamps to messages

d420773

-Added time stamps to the bottom right of message bubbles.

Resolved merge conflicts in ChatScreen

54d3d6d

merge conflicts were not, infact resolved. my b collin, all better now

85a3b18

fixed issue with messages not getting shown on chat screen after quit…

715c25d

…ting app git status ! make sure to clear data on app before running this git status

Changed chat/file sending so it is being sent as a JSON payload via H…

6042089

…TTP Post Was originally being sent via HTTP GET which has some problems.

ForbiddenKiwis and others added 20 commits March 2, 2026 16:31

Refactor ChatScreen.kt Log into Timber

61c8430

Refactor CrashHandler.kt Log into Timber

3b6d5d8

Refactor JSONSchema.kt Log into Timber

9bdedfe

Refactor MessageNetworkHandler.kt Log into Timber

db477d1

Refactor MessageService.kt Log into Timber

e3ce8c2

Refactor ConversationRepository.kt Log into Timber

a077988

Refactor ChatScreenViewModel.kt Log into Timber

80fc264

Refactor ConversationsHomeScreenViewModel.kt Log into Timber

d236ca6

Refactor Logger.kt Log into Timber

8c3c91f

Refactor MessageMigrationUtils.kt Log into Timber

f8b5ca0

Refactor AppServer.kt Log into Timber

b597c43

Refactor TestDeviceEntry.kt Log into Timber

dad102d

Refactor TestDeviceService.kt Log into Timber

3046a5a

Refactor HomeScreenViewModel.kt Log into Timber

bdd250c

Refactor NetworkScreenViewModel.kt Log into Timber

1ed29aa

Refactor OnboardingViewModel.kt Log into Timber

079c0ee

Refactor SelectDestNodeScreenViewModel.kt Log into Timber

2c31b67

Refactor ReceiveScreen.kt Log into Timber

90675aa

Refactor MNetLoggerAndroid.kt Log into Timber

eb268f0

Merge remote-tracking branch 'origin/Debug-Build-Type' into Debug-Bui…

148b743

…ld-Type # Conflicts: # app/src/main/java/com/greybox/projectmesh/messaging/network/MessageNetworkHandler.kt # app/src/main/java/com/greybox/projectmesh/navigation/BottomNavHost.kt

ccameron-gb requested a review from taimuradam March 17, 2026 00:23

taimuradam reviewed Mar 23, 2026

View reviewed changes

app/src/main/java/com/greybox/projectmesh/MainActivity.kt Outdated Show resolved Hide resolved

taimuradam reviewed Mar 23, 2026

View reviewed changes

app/src/main/AndroidManifest.xml Show resolved Hide resolved

taimuradam reviewed Mar 23, 2026

View reviewed changes

app/build.gradle.kts Outdated Show resolved Hide resolved

taimuradam requested changes Mar 23, 2026

View reviewed changes

Pr Review Fixes

8b72843

ccameron-gb requested a review from taimuradam March 31, 2026 00:03

taimuradam approved these changes Mar 31, 2026

View reviewed changes

procrastinator007 approved these changes Apr 6, 2026

View reviewed changes

Conversation

ForbiddenKiwis commented Jun 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

taimuradam left a comment

Choose a reason for hiding this comment

Uh oh!

procrastinator007 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ccameron-gb commented Apr 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants