Skip to content

Conversation

@shubham1g5
Copy link
Contributor

@shubham1g5 shubham1g5 commented Jul 3, 2025

PR for building Hotix for Connect Beta adding twilio fallback

OrangeAndGreen and others added 30 commits March 21, 2025 11:38
… into dv/token_exceptions

Resolved conflicts in ApiConnectId and ConnectSsoHelper.
Handling thrown token exceptions throughout the code and reporting to UI where appropriate.
Changes to delivery progress text for each payment unit
@shubham1g5 shubham1g5 added the skip-integration-tests Skip android tests. label Jul 3, 2025
@shubham1g5
Copy link
Contributor Author

@damagatchi retest this please

2 similar comments
@shubham1g5
Copy link
Contributor Author

@damagatchi retest this please

@shubham1g5
Copy link
Contributor Author

@damagatchi retest this please

@coderabbitai
Copy link

coderabbitai bot commented Jul 3, 2025

Warning

Rate limit exceeded

@shubham1g5 has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 8 minutes and 17 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Reviewing files that changed from the base of the PR and between fb95365 and 310ab10.

⛔ Files ignored due to path filters (3)
  • app/res/drawable/icon_chevron_left_brand.png is excluded by !**/*.png
  • app/res/drawable/icon_chevron_left_primary.png is excluded by !**/*.png
  • app/res/font/roboto_medium.ttf is excluded by !**/*.ttf
📒 Files selected for processing (100)
  • app/AndroidManifest.xml (8 hunks)
  • app/build.gradle (2 hunks)
  • app/res/drawable-night/ic_connect_message_large.xml (1 hunks)
  • app/res/drawable/ic_connect_payment_revert.xml (0 hunks)
  • app/res/layout-land/home_screen.xml (0 hunks)
  • app/res/layout/fragment_connect_delivery_details.xml (2 hunks)
  • app/res/layout/fragment_connect_delivery_progress.xml (1 hunks)
  • app/res/layout/fragment_connect_job_intro.xml (1 hunks)
  • app/res/layout/fragment_connect_jobs_list.xml (2 hunks)
  • app/res/layout/fragment_connect_learning_progress.xml (1 hunks)
  • app/res/layout/fragment_connect_progress_delivery.xml (1 hunks)
  • app/res/layout/item_channel.xml (1 hunks)
  • app/res/layout/screen_personalid_phone_verify.xml (1 hunks)
  • app/res/menu/menu_connect.xml (1 hunks)
  • app/res/values-fr/strings.xml (2 hunks)
  • app/res/values-pt/strings.xml (2 hunks)
  • app/res/values-sw/strings.xml (2 hunks)
  • app/res/values-ti/strings.xml (2 hunks)
  • app/res/values/dimens.xml (1 hunks)
  • app/res/values/strings.xml (2 hunks)
  • app/src/org/commcare/CommCareApplication.java (4 hunks)
  • app/src/org/commcare/CommCareNoficationManager.java (3 hunks)
  • app/src/org/commcare/activities/LoginActivity.java (3 hunks)
  • app/src/org/commcare/activities/LoginActivityUIController.java (1 hunks)
  • app/src/org/commcare/activities/StandardHomeActivity.java (6 hunks)
  • app/src/org/commcare/activities/StandardHomeActivityUIController.java (4 hunks)
  • app/src/org/commcare/activities/connect/ConnectActivity.java (1 hunks)
  • app/src/org/commcare/activities/connect/ConnectMessagingActivity.java (1 hunks)
  • app/src/org/commcare/activities/connect/PersonalIdActivity.java (0 hunks)
  • app/src/org/commcare/adapters/ChannelAdapter.java (1 hunks)
  • app/src/org/commcare/adapters/ConnectDeliveryProgressReportAdapter.java (1 hunks)
  • app/src/org/commcare/adapters/ConnectMessageAdapter.java (1 hunks)
  • app/src/org/commcare/adapters/ConnectProgressJobSummaryAdapter.java (1 hunks)
  • app/src/org/commcare/adapters/JobListConnectHomeAppsAdapter.java (1 hunks)
  • app/src/org/commcare/android/database/connect/models/ConnectJobAssessmentRecord.java (1 hunks)
  • app/src/org/commcare/android/database/connect/models/ConnectJobLearningRecord.java (1 hunks)
  • app/src/org/commcare/android/database/connect/models/PersonalIdSessionData.kt (1 hunks)
  • app/src/org/commcare/android/integrity/IntegrityTokenApiRequestHelper.kt (5 hunks)
  • app/src/org/commcare/android/integrity/IntegrityTokenViewModel.kt (2 hunks)
  • app/src/org/commcare/connect/ConnectConstants.java (1 hunks)
  • app/src/org/commcare/connect/ConnectJobListLauncher.java (1 hunks)
  • app/src/org/commcare/connect/ConnectManager.java (1 hunks)
  • app/src/org/commcare/connect/IConnectAppLauncher.java (1 hunks)
  • app/src/org/commcare/connect/MessageManager.java (1 hunks)
  • app/src/org/commcare/connect/PersonalIdManager.java (5 hunks)
  • app/src/org/commcare/connect/database/ConnectDatabaseHelper.java (3 hunks)
  • app/src/org/commcare/connect/database/ConnectDatabaseUtils.java (4 hunks)
  • app/src/org/commcare/connect/database/ConnectJobUtils.java (2 hunks)
  • app/src/org/commcare/connect/database/ConnectMessagingDatabaseHelper.java (1 hunks)
  • app/src/org/commcare/connect/database/ConnectUserDatabaseUtil.java (2 hunks)
  • app/src/org/commcare/connect/database/JobStoreManager.java (2 hunks)
  • app/src/org/commcare/connect/network/ApiPersonalId.java (8 hunks)
  • app/src/org/commcare/connect/network/ConnectSsoHelper.java (1 hunks)
  • app/src/org/commcare/connect/network/PersonalIdApiErrorHandler.java (2 hunks)
  • app/src/org/commcare/connect/network/PersonalIdApiHandler.java (3 hunks)
  • app/src/org/commcare/connect/network/connectId/ApiClient.java (1 hunks)
  • app/src/org/commcare/connect/network/connectId/ApiEndPoints.java (1 hunks)
  • app/src/org/commcare/connect/network/connectId/ApiService.java (1 hunks)
  • app/src/org/commcare/connect/network/parser/ConfirmBackupCodeResponseParser.java (1 hunks)
  • app/src/org/commcare/connect/network/parser/StartConfigurationResponseParser.java (1 hunks)
  • app/src/org/commcare/fragments/SelectInstallModeFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectDeliveryDetailsFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectDeliveryListFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectDeliveryProgressDeliveryFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectDeliveryProgressFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectDownloadingFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectJobDetailBottomSheetDialogFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectJobIntroFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectJobsListsFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectLearningProgressFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectResultsListFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectResultsSummaryListFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connect/ConnectUnlockFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelConsentBottomSheet.java (1 hunks)
  • app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelListFragment.java (1 hunks)
  • app/src/org/commcare/fragments/connectMessaging/ConnectMessageChatData.java (1 hunks)
  • app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java (1 hunks)
  • app/src/org/commcare/fragments/personalId/PersonalIdBackupCodeFragment.java (2 hunks)
  • app/src/org/commcare/fragments/personalId/PersonalIdMessageFragment.java (1 hunks)
  • app/src/org/commcare/fragments/personalId/PersonalIdPhoneFragment.java (5 hunks)
  • app/src/org/commcare/fragments/personalId/PersonalIdPhoneVerificationFragment.java (7 hunks)
  • app/src/org/commcare/interfaces/OnJobSelectionClick.java (1 hunks)
  • app/src/org/commcare/models/connect/ConnectLoginJobListModel.java (1 hunks)
  • app/src/org/commcare/network/HttpCalloutTask.java (1 hunks)
  • app/src/org/commcare/services/CommCareFirebaseMessagingService.java (2 hunks)
  • app/src/org/commcare/services/PaymentAcknowledgeReceiver.java (1 hunks)
  • app/src/org/commcare/tasks/ManageKeyRecordTask.java (1 hunks)
  • app/src/org/commcare/utils/BiometricsHelper.java (3 hunks)
  • app/src/org/commcare/utils/CommCareNavigationController.kt (1 hunks)
  • app/src/org/commcare/utils/FirebaseAuthService.java (3 hunks)
  • app/src/org/commcare/utils/OtpAuthService.java (0 hunks)
  • app/src/org/commcare/utils/OtpAuthService.kt (1 hunks)
  • app/src/org/commcare/utils/OtpManager.java (1 hunks)
  • app/src/org/commcare/utils/OtpVerificationCallback.java (1 hunks)
  • app/src/org/commcare/utils/PersonalIDAuthService.kt (1 hunks)
  • app/src/org/commcare/views/connect/CustomOtpView.java (1 hunks)
  • app/src/org/commcare/views/connect/LinearProgressBar.java (0 hunks)
  • app/unit-tests/src/org/commcare/CommCareTestApplication.java (5 hunks)
  • app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java (4 hunks)
  • commcare-support-library/src/main/java/org/commcare/commcaresupportlibrary/CommCareLauncher.java (1 hunks)
📝 Walkthrough

Walkthrough

This update introduces a comprehensive set of features and improvements centered around the new "Connect" module, which includes job management, messaging, delivery tracking, and enhanced PersonalID/OTP flows within the CommCare Android application. Two new activities—ConnectActivity and ConnectMessagingActivity—are added, along with a new broadcast receiver for payment acknowledgments. The ConnectManager singleton orchestrates ConnectID workflows, job/user state, app launching, and messaging integration. Numerous fragments, adapters, and database helpers are introduced to support Connect job lists, job details, delivery progress, messaging channels, and chat UIs. The OTP authentication system is refactored to support both Firebase and PersonalID-based flows, with new Kotlin interfaces and services. Notification handling is upgraded to support Connect-related actions and messaging broadcasts. Layouts, string resources (including localizations), and menu resources are enhanced to support the new UI components and flows.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant ConnectActivity
    participant ConnectManager
    participant API/Backend
    participant Messaging UI
    participant CommCareFirebaseMessagingService

    User->>ConnectActivity: Launch Connect feature
    ConnectActivity->>ConnectManager: Initialize Connect session
    ConnectActivity->>ConnectManager: Fetch user and active job
    ConnectManager->>API/Backend: Fetch job opportunities, user info
    API/Backend-->>ConnectManager: Job/user data
    ConnectManager-->>ConnectActivity: Update UI with jobs

    User->>ConnectActivity: Select job/messaging
    ConnectActivity->>Messaging UI: Navigate to chat/channel list
    User->>Messaging UI: Send message
    Messaging UI->>ConnectManager: Store/send message
    ConnectManager->>API/Backend: Send message to server
    API/Backend-->>ConnectManager: Message delivery status

    API/Backend-->>CommCareFirebaseMessagingService: Push notification (data payload)
    CommCareFirebaseMessagingService->>ConnectManager: Process Connect action
    CommCareFirebaseMessagingService->>Messaging UI: Broadcast update (if relevant)
    CommCareFirebaseMessagingService->>User: Show notification (if not viewing messaging)

    User->>ConnectActivity: Confirm payment via notification
    CommCareFirebaseMessagingService->>PaymentAcknowledgeReceiver: Broadcast with payment info
    PaymentAcknowledgeReceiver->>ConnectManager: Update payment status
    ConnectManager->>API/Backend: Confirm payment
    API/Backend-->>ConnectManager: Confirmation result
    ConnectManager-->>User: Update UI/payment status
Loading

Possibly related PRs

  • - removed duplicate dependencies #3115: Reorganizes and removes duplicate Google Play Services dependencies in app/build.gradle, directly related to similar dependency management changes in this PR.
  • Messaging push notification improvements #2966: Introduces the messaging notification channel and enhances push notifications, strongly connected to this PR's new messaging notification features and channels.
  • Restore Connect buttons in beta #3189: Modifies Connect button visibility logic in LoginActivityUIController and SelectInstallModeFragment, directly related to this PR's changes in Connect-related UI button logic.

Suggested labels

skip-integration-tests

Suggested reviewers

  • pm-dimagi
  • OrangeAndGreen
✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate Unit Tests
  • Create PR with Unit Tests
  • Post Copyable Unit Tests in a Comment
  • Commit Unit Tests in branch june_beta_hotfix

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.
    • Explain this complex logic.
    • 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 explain this code block.
    • @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 explain its main purpose.
    • @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 auto-generate unit tests to generate unit tests for 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.

@shubham1g5 shubham1g5 closed this Jul 5, 2025
@shubham1g5 shubham1g5 deleted the june_beta_hotfix branch July 5, 2025 03:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-integration-tests Skip android tests.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants