Skip to content

Conversation

@pm-dimagi
Copy link
Contributor

Product Description

https://dimagi.atlassian.net/browse/QA-7705
bug fix for connect landing page
https://dimagi.atlassian.net/browse/CCCT-988

cross-request: dimagi/commcare-core#1455

Technical Summary

Feature Flag

Safety Assurance

Safety story

In this the impact will be time shown as working hours on the connect job screens
we have to show the time n local time zone
I have manually checked the times it showing correct on all job screen

Automated test coverage

QA Plan

Labels and Review

  • Do we need to enhance the manual QA test coverage ? If yes, the "QA Note" label is set correctly
  • Does the PR introduce any major changes worth communicating ? If yes, the "Release Note" label is set and a "Release Note" is specified in PR description.
  • Risk label is set correctly
  • The set of people pinged as reviewers is appropriate for the level of risk of the change

@coderabbitai
Copy link

coderabbitai bot commented May 1, 2025

📝 Walkthrough

Walkthrough

The changes update several areas of the codebase related to handling Connect opportunity status and working hours formatting. In HomeScreenBaseActivity.java, the userPressedOpportunityStatus() method now attaches an intent with extra data to the result returned to the calling activity, ensuring the extra flag is properly delivered. In ConnectIdActivity.java, the request code checked in onActivityResult is switched from CONNECTID_REQUEST_CODE to CONNECT_JOB_INFO, changing which activity result triggers redirection logic. The ConnectJobRecord class refactors the getWorkingHours() method to consistently use SimpleDateFormat for time parsing and formatting, always converting from UTC to the local timezone, and removes conditional logic based on Android SDK version. Lastly, the CONNECTID_REQUEST_CODE constant is removed from ConnectConstants.java.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant HomeScreenBaseActivity
    participant CallingActivity

    User->>HomeScreenBaseActivity: Presses Opportunity Status
    HomeScreenBaseActivity->>CallingActivity: setResult(RESULT_OK, intent with REDIRECT_TO_CONNECT_OPPORTUNITY_INFO)
    HomeScreenBaseActivity->>HomeScreenBaseActivity: finish()
Loading
sequenceDiagram
    participant ConnectIdActivity
    participant PreviousActivity

    PreviousActivity->>ConnectIdActivity: startActivityForResult(CONNECT_JOB_INFO)
    ConnectIdActivity->>PreviousActivity: onActivityResult(requestCode=CONNECT_JOB_INFO, data)
    alt requestCode == CONNECT_JOB_INFO
        ConnectIdActivity->>ConnectIdActivity: handleRedirection(data)
    end
Loading

Possibly related PRs

  • Solved crash for older Android versions #3032: Refactored getWorkingHours() in ConnectJobRecord to add fallback parsing for older Android versions, which is further modified in this PR for consistent timezone handling.
  • Phase 2 Connect Merge Fixes #3034: Refactored redirection logic for Connect opportunity status, closely related to the changes in userPressedOpportunityStatus() and intent handling in this PR.

Suggested reviewers

  • OrangeAndGreen
  • shubham1g5
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between e4fad88 and 7554659.

📒 Files selected for processing (4)
  • app/src/org/commcare/activities/HomeScreenBaseActivity.java (1 hunks)
  • app/src/org/commcare/activities/connect/ConnectIdActivity.java (1 hunks)
  • app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java (2 hunks)
  • app/src/org/commcare/connect/ConnectConstants.java (0 hunks)
💤 Files with no reviewable changes (1)
  • app/src/org/commcare/connect/ConnectConstants.java
🧰 Additional context used
🧬 Code Graph Analysis (1)
app/src/org/commcare/activities/connect/ConnectIdActivity.java (1)
app/src/org/commcare/connect/ConnectConstants.java (1)
  • ConnectConstants (8-83)
🔇 Additional comments (2)
app/src/org/commcare/activities/connect/ConnectIdActivity.java (1)

49-49: Code refactoring to use a different request code constant

The code now checks for CONNECT_JOB_INFO instead of the removed CONNECTID_REQUEST_CODE constant, which aligns with changes in ConnectConstants.java. This ensures consistent request code handling across the Connect functionality.

app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java (1)

464-476: Improved time zone handling for displaying working hours

The implementation now consistently handles time zone conversion, ensuring working hours are always displayed in the user's local time rather than UTC. This improves the user experience by showing correct working hours in the Connect job screens.

Key improvements:

  • Explicitly sets input timezone to UTC for parsing
  • Correctly converts to the local timezone for display
  • Uses a consistent SimpleDateFormat approach

Comment on lines 582 to +584
Intent i = new Intent();
i.putExtra(REDIRECT_TO_CONNECT_OPPORTUNITY_INFO, true);
setResult(RESULT_OK);
setResult(RESULT_OK, i);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Bug fix: Now correctly passing intent data with result

This change fixes a critical issue where the intent containing the REDIRECT_TO_CONNECT_OPPORTUNITY_INFO flag wasn't being passed to the calling activity, causing the job status button click functionality to fail.

🤖 Prompt for AI Agents (early access)
In app/src/org/commcare/activities/HomeScreenBaseActivity.java around lines 582 to 584, the intent with the REDIRECT_TO_CONNECT_OPPORTUNITY_INFO flag was not properly passed back to the calling activity. Fix this by creating a new Intent, adding the flag as an extra, and then passing this intent to setResult with RESULT_OK to ensure the calling activity receives the data correctly.

@pm-dimagi
Copy link
Contributor Author

@damagatchi retest this please

1 similar comment
@pm-dimagi
Copy link
Contributor Author

@damagatchi retest this please

@pm-dimagi pm-dimagi merged commit 514ad11 into dv/connect_initial May 1, 2025
2 checks passed
@coderabbitai coderabbitai bot mentioned this pull request May 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants