Pm messaging merge #2956
Closed
Pm messaging merge #2956
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… into jp/CCCT-485-connect-messaging-implementation Removed some unnecessary imports.
…plementation CCCT-485 || Connect Messaging Implementation Part-1
Localized messaging page title. Fixed possible infinite recursion when backing up from jobs list. Not updating message page if the user already navigated away.
…nto connect_qa
…nto dv/connect_initial
Scrolling to bottom of message list when user clicks EditText at bottom (and keyboard opens).
…droid into dv/connect_initial
-rounded button issue resolved
Pm round button
…being applied in fragments).
…into pm_core_pr
Display short description at home screen for logged in app
Added analytics event when database is rekeyed with new passphrase.
…ing build number)
Solved crash for older Android versions
Fixed logic around receiving and storing Connect DB passphrases.
…nto connect_qa
Using CommCare BuildConfig
… into master_connectid_merge # Conflicts: # app/AndroidManifest.xml # app/build.gradle # app/res/layout-land/home_screen.xml # app/res/layout/fragment_phone_available_bottom_sheet.xml # app/res/layout/fragment_recovery_code.xml # app/res/layout/fragment_secondary_phone_number.xml # app/res/layout/fragment_signup.xml # app/res/layout/home_screen.xml # app/res/layout/screen_connect_message.xml # app/res/layout/screen_connect_password_verify.xml # app/res/layout/screen_connect_phone_verify.xml # app/res/layout/screen_connect_user_deactivate_otp_verify.xml # app/res/layout/screen_connect_verify.xml # app/res/layout/screen_login.xml # app/res/layout/select_install_mode_fragment.xml # app/res/navigation/nav_graph_connectid.xml # app/res/values/colors.xml # app/res/values/strings.xml # app/res/values/themes.xml # app/src/org/commcare/activities/CommCareSetupActivity.java # app/src/org/commcare/activities/DispatchActivity.java # app/src/org/commcare/activities/HomeButtons.java # app/src/org/commcare/activities/HomeScreenBaseActivity.java # app/src/org/commcare/activities/LoginActivity.java # app/src/org/commcare/activities/LoginActivityUiController.java # app/src/org/commcare/activities/SettingsHelper.java # app/src/org/commcare/activities/StandardHomeActivity.java # app/src/org/commcare/activities/StandardHomeActivityUIController.java # app/src/org/commcare/activities/connect/ConnectIdActivity.java # app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java # app/src/org/commcare/android/database/connect/models/ConnectLinkedAppRecord.java # app/src/org/commcare/android/database/connect/models/ConnectUserRecord.java # app/src/org/commcare/connect/ConnectConstants.java # app/src/org/commcare/connect/SMSBroadcastReceiver.java # app/src/org/commcare/connect/database/ConnectAppDatabaseUtil.java # app/src/org/commcare/connect/database/ConnectJobUtils.java # app/src/org/commcare/connect/database/ConnectUserDatabaseUtil.java # app/src/org/commcare/connect/network/ApiConnect.java # app/src/org/commcare/connect/network/ApiConnectId.java # app/src/org/commcare/connect/network/ConnectNetworkHelper.java # app/src/org/commcare/connect/network/ConnectNetworkServiceFactory.kt # app/src/org/commcare/connect/network/ConnectSsoHelper.java # app/src/org/commcare/connect/workers/ConnectHeartbeatWorker.kt # app/src/org/commcare/fragments/SelectInstallModeFragment.java # app/src/org/commcare/fragments/connectId/ConnectIDSecondaryPhoneNumber.java # app/src/org/commcare/fragments/connectId/ConnectIDSignupFragment.java # app/src/org/commcare/fragments/connectId/ConnectIdBiometricConfigFragment.java # app/src/org/commcare/fragments/connectId/ConnectIdMessageFragment.java # app/src/org/commcare/fragments/connectId/ConnectIdPasswordVerificationFragment.java # app/src/org/commcare/fragments/connectId/ConnectIdPhoneAvailableBottomSheet.java # app/src/org/commcare/fragments/connectId/ConnectIdPinFragment.java # app/src/org/commcare/fragments/connectId/ConnectIdUserDeactivateOTPVerificationFragment.java # app/src/org/commcare/google/services/analytics/AnalyticsParamValue.java # app/src/org/commcare/google/services/analytics/CCAnalyticsEvent.java # app/src/org/commcare/google/services/analytics/CCAnalyticsParam.java # app/src/org/commcare/google/services/analytics/FirebaseAnalyticsUtil.java # app/src/org/commcare/network/CommcareRequestGenerator.java # app/src/org/commcare/network/HttpUtils.java # app/src/org/commcare/preferences/AppManagerDeveloperPreferences.java # app/src/org/commcare/utils/BiometricsHelper.java # app/src/org/commcare/utils/CrashUtil.java # app/src/org/commcare/utils/EncryptionKeyAndTransform.java # app/src/org/commcare/utils/KeyboardHelper.java # app/src/org/commcare/utils/PhoneNumberHelper.java # build.gradle
…re-android into master_connectid_merge # Conflicts: # app/src/org/commcare/activities/StandardHomeActivity.java
Master connectid merge
- fix if check
Fixed signup blocker
connect qa branch with all latest phase2 pr merge work
…re-android into pm_messaging_merge # Conflicts: # app/res/layout/fragment_channel_consent_bottom_sheet.xml # app/res/layout/item_channel.xml # app/res/navigation/nav_graph_connect_messaging.xml # app/res/values/colors.xml # app/res/values/strings.xml # app/src/org/commcare/CommCareNoficationManager.java # app/src/org/commcare/activities/connect/ConnectMessagingActivity.java # app/src/org/commcare/adapters/ChannelAdapter.java # app/src/org/commcare/adapters/ConnectMessageAdapter.java # app/src/org/commcare/android/database/connect/models/ConnectMessagingChannelRecord.java # app/src/org/commcare/android/database/connect/models/ConnectMessagingMessageRecord.java # app/src/org/commcare/android/database/connect/models/ConnectUserRecord.java # app/src/org/commcare/connect/ConnectConstants.java # app/src/org/commcare/connect/ConnectManager.java # app/src/org/commcare/connect/MessageManager.java # app/src/org/commcare/connect/network/ApiConnect.java # app/src/org/commcare/connect/network/ApiConnectId.java # app/src/org/commcare/connect/network/ConnectNetworkHelper.java # app/src/org/commcare/connect/network/ConnectSsoHelper.java # app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelConsentBottomSheet.java # app/src/org/commcare/fragments/connectMessaging/ConnectMessageChannelListFragment.java # app/src/org/commcare/fragments/connectMessaging/ConnectMessageChatData.java # app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java # app/src/org/commcare/google/services/analytics/CCAnalyticsParam.java # app/src/org/commcare/google/services/analytics/FirebaseAnalyticsUtil.java # app/src/org/commcare/services/CommCareFirebaseMessagingService.java # app/src/org/commcare/services/PaymentAcknowledgeReceiver.java
Contributor
Author
|
Created new pr for phase 4 |
This was referenced Jul 22, 2025
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Product Description
Messaging feature which allows user to chat with the server
Feature Flag
Messaging
Safety Assurance
Safety story
-Done local testing of the connect side code
-Not tested the effect of this on commcare
Labels and Review