summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-03Separate calls with the video feature from others when coalescing rows in ↵linyuh
the new call log. Test: CoalescerTest PiperOrigin-RevId: 191376690 Change-Id: Id5939175edddd164a1b477319fb20e6d2a9671a9
2018-04-03Support placing Duo calls in the new UI's bottom sheet.linyuh
Bug: 70988685 Test: DuoCallModuleTest, PlaceDuoCallEndToEndTest, Manual testing PiperOrigin-RevId: 191372706 Change-Id: I439be71c361eaca722820b81278e5f95322e100c
2018-04-03Turn off component generating step of RootComponentGenerato and ↵weijiaxu
@DialerCompoennt. Delete related tests. Test: On a local device. PiperOrigin-RevId: 191365675 Change-Id: Ia90463b936f3f07df99909c463b2bdb51223fbe6
2018-04-03Implement dialog for responding RTT request.wangqi
Bug: 67596257 Test: manual PiperOrigin-RevId: 191365412 Change-Id: Ida741a837d6495c0d5f51b748f4d6c09a1beafec
2018-04-02Merge "Disable transcrption downloads for T-Mobile."Treehugger Robot
2018-04-02Disable transcrption downloads for T-Mobile.twyen
In this CL, the client will stop treating text/* attachments as transcrptions for T-mobile. Transcriptions are already disabled by the device type sent during provisioning so this will not affect any existing functionality. This prevents other data on the server showing up as transcription. Bug: 77342321 Test: TAP, exact behavior not testable. PiperOrigin-RevId: 191350836 Change-Id: I758996c3fef75ece7cecf0f7a0b4df7ace970d80
2018-04-02Merge changes I332d53ab,I18d63f4eTreehugger Robot
* changes: Update contact photo for RTT call screen. Fix the bug that number format is not correct in RTL mode.
2018-04-02Update contact photo for RTT call screen.wangqi
Bug: 70177426 Test: manual PiperOrigin-RevId: 191348602 Change-Id: I332d53ab0c3c628b3dca0c184435bafcf2a13d02
2018-04-02Fix the bug that number format is not correct in RTL mode.wangqi
Bug: 76227259 Test: manual PiperOrigin-RevId: 191347301 Change-Id: I18d63f4e85ca07be00f7564a5ee256d3a6b1b480
2018-04-02Merge "Use real prebuilt module for JavaPoet"Tony Mantler
2018-03-31Merge "Use IS_READ instead of NEW in new call log."Treehugger Robot
2018-03-31Merge "Add upgrade to RTT call button."Treehugger Robot
2018-03-30Use IS_READ instead of NEW in new call log.zachh
We want to be more consistent with other usages of NEW in the app, i.e. NEW should be used primarily by notifications. Bug: 74821515 Test: unit PiperOrigin-RevId: 191139559 Change-Id: Ib6fbead8b5589aedd881db26a07f7daed4d83543
2018-03-30Add upgrade to RTT call button.wangqi
This button has higher priority over add call button if RTT is enabled. Bug: 67596257 Test: ButtonChooserIntegrationTest PiperOrigin-RevId: 191129313 Change-Id: I5a3302a0970e77a933439749e0e559a691235523
2018-03-30Merge "Add SpeedDialEntry database helper."Treehugger Robot
2018-03-30Add SpeedDialEntry database helper.calderwoodra
Bug: 36841782 Test: SpeedDialEntryDatabaseHelperTest PiperOrigin-RevId: 191121137 Change-Id: Iab712d5fac56e515bd4e977282656bf80db4337d
2018-03-30Merge "Fix bubble showing after dismiss bug."Treehugger Robot
2018-03-30Merge changes I47f1e487,I715a97ba,Idb424831Treehugger Robot
* changes: Added logging for popping in new call log. Move update color code from CallCardPresenter to InCallPresenter. Log the number of "invalid" CP2 rows.
2018-03-30Merge "Implement new blocking"Treehugger Robot
2018-03-30Fix bubble showing after dismiss bug.yueg
Now we also show bubble in onCallListChange(), but we shouldn't show bubble after dismiss in this case. Test: ReturnToCallControllerTest PiperOrigin-RevId: 191101307 Change-Id: I13ff6bf4ae7ab574966c43c0e6fee13853899ba0
2018-03-30Added logging for popping in new call log.zachh
Bug: 70989667 Test: unit PiperOrigin-RevId: 191099351 Change-Id: I47f1e487e2a0cc23af7b39ae89e20abf993933ea
2018-03-30Move update color code from CallCardPresenter to InCallPresenter.yueg
Bug: 74022483 Test: manual PiperOrigin-RevId: 191098829 Change-Id: I715a97ba48db9a3a81ef7b27750131a3a3a331b7
2018-03-30Log the number of "invalid" CP2 rows.zachh
Also use a flag to control the threshold at which we process invalid numbers. Bug: 70989667 Test: unit PiperOrigin-RevId: 191095892 Change-Id: Idb424831d637ae44e5e5915afaf59c3d534ce4a0
2018-03-30Implement new blockingtwyen
Old blocking is deprecated. Bug: 70989544 Test: TAP PiperOrigin-RevId: 191086875 Change-Id: Icde4963fce603fc4e16e486b78c070bd439e26e4
2018-03-30Merge "Differentiate video call types (carrier/Duo) in call descriptions for ↵Treehugger Robot
the new UI."
2018-03-30Differentiate video call types (carrier/Duo) in call descriptions for the ↵linyuh
new UI. Bug: 70988686 Test: CallLogEntryTextTest PiperOrigin-RevId: 191071267 Change-Id: I392e3b4c47e266f0a553fe28079d4800fc174a8f
2018-03-30Merge "Use existing transcription from transcription server if available"Treehugger Robot
2018-03-30Merge "Update what happens when donation is rejected & use correct donation ↵Treehugger Robot
availability check"
2018-03-29Use existing transcription from transcription server if availableuabdullah
Repeated requests from the server responds in an ALREADY_EXISTS error and does not transcribe the voicemails. In that case we should ask the server if the request is present already on the server, and if so retrieve it. Bug: 77236260 Test: N/A PiperOrigin-RevId: 191016332 Change-Id: I605c546a3bec3599c7b162853463ca7e46f63886
2018-03-29Update what happens when donation is rejected & use correct donation ↵uabdullah
availability check Checking donation is not a simple config check, but everything that donation availability is dependent on via the isVoicemailDonationAvailable() helper method. We update the code accordingly. When the user declines the promo for donation, we should also update the toggle accordingly. Bug: 74033229 Test: N/A PiperOrigin-RevId: 191011808 Change-Id: I6e4ff9914355deed72175179fc7b9009f2395ef5
2018-03-30Merge "UI adjustment to RTT screen."Treehugger Robot
2018-03-30Merge "Mark spam voicemail as old after we auto block it."Treehugger Robot
2018-03-29UI adjustment to RTT screen.wangqi
1. Don't close overflow menu after menu item is clicked. 2. Add correct shadow and animation to overflow menu. 3. Only scroll when remote message is updated if input box is empty. 4. Only hide keyboard if scrolling up is triggered by user. 5. Add paddingTop to recyclerView so that first message won't be covered by toolbar. Bug: 70177426 Test: manual PiperOrigin-RevId: 191002774 Change-Id: Ic69f80323e3d31d7853d4e8d0c6e4c100fe4a776
2018-03-29Mark spam voicemail as old after we auto block it.Android Dialer
Bug: 77242856 Test: N/A PiperOrigin-RevId: 191002650 Change-Id: Ia74423f28a40f148d507fb9f907fc2e5c41fc183
2018-03-29Merge "Fix bug preventing rejecting video calls"Treehugger Robot
2018-03-29Fix bug preventing rejecting video callsroldenburg
Bug: 75602772,77235335 Test: ImsVideoTechTest PiperOrigin-RevId: 190988177 Change-Id: I2f4883f6bf492b380ef839562fd65ff6ac630bfb
2018-03-29Merge "Fixed a few issues in search with new nav."Treehugger Robot
2018-03-29Fixed a few issues in search with new nav.calderwoodra
- back arrow in search now flips in RTL mode http://screen/1eccBLDqPp0 - search text no longer overlaps icons http://screen/Mq0omQEuZez - keyboard now always closes on pause - location permission is no longer visible in dialpad search Bug: 73088433,74784637,76117373,76440832,76441216 Test: keyboard and rtl tested manually, added test for location permission PiperOrigin-RevId: 190981686 Change-Id: Ia121d410c158df0de9cd731ab280a6d8e9b300d9
2018-03-29Use real prebuilt module for JavaPoetTony Mantler
Bug: 77148954 Test: m -j Dialer Change-Id: Ife575d816af624a6a1dcb4ddc2c3be539bcd61ff
2018-03-29Merge "Delete unnecessary logging code."Treehugger Robot
2018-03-29Merge "Replace png icons with vector drawable for video call screen."Treehugger Robot
2018-03-29Merge "Badge contact photos for video calls in the bottom sheet."Treehugger Robot
2018-03-29Delete unnecessary logging code.Weijia Xu
Change-Id: I70a6f1e2f59677292219a1ea4f493e6918f1956a Test: Local run.
2018-03-29Replace png icons with vector drawable for video call screen.wangqi
Bug: 76221932 Test: manual PiperOrigin-RevId: 190948113 Change-Id: I4151ab3fc5231183d49fc1bdc247a09e5ffadc22
2018-03-29Badge contact photos for video calls in the bottom sheet.linyuh
Bug: 70988682 Test: Existing tests PiperOrigin-RevId: 190946639 Change-Id: Iaa8294e8ba6e85ab3c27bb2e67200d7972a240f2
2018-03-29Merge "Show toast when handing off from LTE to WiFi"Treehugger Robot
2018-03-29Merge changes Ib658efa6,I0f84f15cTreehugger Robot
* changes: Create a common widget (ContactPhotoView) for a contact photo and its optional badge. Remove unnecessary call to StatusBarNotifier.updateNotification().
2018-03-28Show toast when handing off from LTE to WiFiroldenburg
Bug: 65490850 Test: manual PiperOrigin-RevId: 190859631 Change-Id: I89aeb41a7709e9366367cdc54ba506e276685b5f
2018-03-28Create a common widget (ContactPhotoView) for a contact photo and its ↵linyuh
optional badge. Bug: 70988682 Test: ContactPhotoViewTest PiperOrigin-RevId: 190855440 Change-Id: Ib658efa6486b66548c710804049517905dc67b13
2018-03-28Remove unnecessary call to StatusBarNotifier.updateNotification().yueg
The call for incoming call is covered in StatusBarNotifier.onStateChange(). The two calls in InCallActivity is not useful (maybe is before notification becoming foreground). Test: manual PiperOrigin-RevId: 190845157 Change-Id: I0f84f15cfda5294566fa8976e09aac5163f85aa9
2018-03-28Merge changes Iaf112cfe,I4835bcbcTreehugger Robot
* changes: Update spam blocking promo wordings. Replace assets "quantum_ic_videocam_white_24" with a vector asset.
2018-03-28Merge "Delete dialer blocking in NUI"Treehugger Robot
2018-03-28Update spam blocking promo wordings.Android Dialer
Bug: 75308663 Test: N/A PiperOrigin-RevId: 190825933 Change-Id: Iaf112cfec81c82e127d77aedba351788a03eee54
2018-03-28Replace assets "quantum_ic_videocam_white_24" with a vector asset.linyuh
Test: Existing tests PiperOrigin-RevId: 190820867 Change-Id: I4835bcbc7698075fb54015dccc6823ada4c71651
2018-03-28Delete dialer blocking in NUItwyen
System blocking should be used instead. These code are obsolete. Bug: 70989544 Test: TAP PiperOrigin-RevId: 190818334 Change-Id: I71475905ba110fdc0560991a2a9c2b9e2f2de9f2
2018-03-28Merge "Turn transcription on if new user accepts Dialer ToS"Treehugger Robot
2018-03-28Merge "When declining Transcription ToS, we should hide the feature ToS."Treehugger Robot
2018-03-28Turn transcription on if new user accepts Dialer ToSuabdullah
When a user accepts the Dialer ToS for the first time, we should also enable transcription if it is available. Bug: 74033229 Test: N/A PiperOrigin-RevId: 190794147 Change-Id: I7eb9b3d481426aceb55a8990fdbd246101937e7b
2018-03-28When declining Transcription ToS, we should hide the feature ToS.uabdullah
When a user declines the transcription, we should turn off transcription and never show the transcription promo ever again. Bug: 74033229 Test: N/A PiperOrigin-RevId: 190790323 Change-Id: Ida60592b0550b18b28e7f7a7a22d19100f56231a
2018-03-28Merge "Badge contact photos in the new call log for video calls."Treehugger Robot
2018-03-28Badge contact photos in the new call log for video calls.linyuh
Bug: 70988682 Test: NewCallLogViewHolderTest PiperOrigin-RevId: 190783830 Change-Id: Ib0b1ec23b7c278b83516019924b6c68ff12adaf9
2018-03-28Merge "Support new call log fragment in old peer."Treehugger Robot
2018-03-28Merge changes Ic084d903,I9cb063a9,I8c0abf9fTreehugger Robot
* changes: Use CallLogConfig for enabling new peer. Turn on transcription when existing dialer user accepts ToS and transcription is available. Turn off transcription when user declines tos (existing dialer user)
2018-03-27Support new call log fragment in old peer.zachh
This makes the old peer read the CallLogConfig#isNewCallLogFragmentEnabled and show the old or new fragment accordingly. If the user is viewing the NewCallLog and the CallLogConfig needs to disable the framework, the new fragment is immediately replaced with the old one. This is necessary because if the user were to scroll the fragment, the AnnotatedCallLog and PhoneLookupHistory databases would be read, which would trigger creation. I don't expect this to be a common case because 1) we hopefully never have to disable the framework and 2) Framework is only updated on Phenotype broadcasts and JobScheduler jobs, which hopefully don't typically happen when user is viewing the call log. However, I still want to make sure that if it happens we don't irreversibly break users when we turn the framework back on. I tested this by flipping flags and observing underlying data being removed: > dialer-cmd configprovider set new_voicemail_fragment_enabled false > adb shell ls /data/data/com.google.android.dialer/databases/ && echo && adb shell cat /data/user_de/0/com.google.android.dialer/shared_prefs/com.google.android.dialer_preferences.xml I test flipping flags back and forth on the call log tab, speed dial tab, and while the activity was paused (pressing Home after viewing call log). Note that this CL doesn't address showing missed calls and badge counts correctly with the new fragment; that will come in a later CL. Bug: 74821995 Test: unit and manual PiperOrigin-RevId: 190706481 Change-Id: I618d9c1649169abd65733502cfebc662a835e787
2018-03-27Use CallLogConfig for enabling new peer.zachh
ConfigProvider should not be used directly for reading NUI flags as CallLogConfig needs to perform work when they change. Bug: 74821995 Test: existing PiperOrigin-RevId: 190698415 Change-Id: Ic084d9032d2a6f35ffba9f395eaaff9053cfa262
2018-03-27Turn on transcription when existing dialer user accepts ToS and ↵uabdullah
transcription is available. Also updated the isVoicemailAvailable helper method, since just checking if the flag and OS is not enough (we have other things such as is VVM enabled, is VM activated), if we don't do this, it doesnt make sense to turn on transcription e.g Why what would happen if transcription is turned on but vvm is disabled Bug: 74033229 Test: Added a todo, will be added later (there are a few more similar CL's that I am sending for other ToS conditions) to ensure the logic is correct for all ToS conditions first and I can add a test right at the end for all conditions. PiperOrigin-RevId: 190696695 Change-Id: I9cb063a97e11943abeb1f823dc661efe88dfa3f1
2018-03-27Turn off transcription when user declines tos (existing dialer user)uabdullah
When an existing dialer user is shown the ToS and they declines it, the transcription setting must be turned off, to respect the users wishes. We also no longer take the user to the settings page. Bug: 74033229,77147114 Test: Unit test PiperOrigin-RevId: 190682249 Change-Id: I8c0abf9f3cbb15ded12a760abe540c557fd2e7d3
2018-03-27Merge changes I1587449f,I594a1667Treehugger Robot
* changes: Delete debugging logging statement in voicemail spam blocking Add permission for in-call visibility change
2018-03-27Delete debugging logging statement in voicemail spam blockingAndroid Dialer
Test: N/A PiperOrigin-RevId: 190673495 Change-Id: I1587449f6b0b53e7a16aac0b334225649a94f27b
2018-03-27Add permission for in-call visibility changeroldenburg
Bug: 76445204 Test: n/a PiperOrigin-RevId: 190650130 Change-Id: I594a16676cfcca4e6a10c1f5bc6604509417ad23
2018-03-27Merge "When transcription setting is enabled, retranscribe voicemails"Treehugger Robot
2018-03-27When transcription setting is enabled, retranscribe voicemailsuabdullah
When transcription toggle is turned off, we delete all local transcriptions. However when it is turned back on, we should re-transcribe all those( previously transcribed, then deleted) voicemails again. Bug: 74033229 Test: N/A PiperOrigin-RevId: 190640972 Change-Id: Iaaf324e74c7630852daeb314f34c2c3095fe3196
2018-03-27Merge "Update T-Mo Transcription ToS for existing users"Treehugger Robot
2018-03-27Update T-Mo Transcription ToS for existing usersuabdullah
Adds the we can turn off transcription from settings. Bug: 76226374 Test: N/A PiperOrigin-RevId: 190626638 Change-Id: I22b56f133cc83749cdd52a4406be0c36c5a0d0ac
2018-03-27Merge "Update T-Mo Transcription ToS"Treehugger Robot
2018-03-27Update T-Mo Transcription ToSuabdullah
Adds the we can turn off transcription from settings. Bug: 76226374 Test: N/A PiperOrigin-RevId: 190623712 Change-Id: Ib2990f9ba025cc5a7f51ba7f7b7d85085327cae9
2018-03-27Merge changes I581d3c9e,Idc52f4e9,Ia8abb468Treehugger Robot
* changes: Remove TODOs left for M in the new call log as the min SDK has been bumped to N. Change the maximum number of notifications per tag from 10 to 8. Replace png icon with vector drawable for voice call screen.
2018-03-27Merge "Fixed drag to remove favorite contacts on a few devices."Treehugger Robot
2018-03-27Merge changes If0de7526,I5fa9e123,I70f2e6dbTreehugger Robot
* changes: Add 311910 to motorola sprint configs. Remove obsolete methods in CompatUtils and rename it as "LocaleUtils". Placing a call from a search action now closes the keyboard.
2018-03-27Merge changes Ia937f030,Ia5f33e45,I1d73a90b,I90fe2d24,I030acbd7, ...Treehugger Robot
* changes: Add Motorola hidden menu to all Sprint MCCMNCs Remove obsolete version checks and compat utilities after min SDK was bumped up to N. Bump version codes and name to v20 Catch BadParcelableException Move spam setting related methods out of spam interface into a separate spam setting interface. Add logging support for auto blocked spam calls.
2018-03-27Merge "Switch setLabel and setLocation"Treehugger Robot
2018-03-27Merge changes I9a8bf666,Icb9f26a9Treehugger Robot
* changes: Forward extras from pre call external receivers to placeCall(). Bumped a few more tests to N.
2018-03-27Merge changes I9949de54,I6f01935f,I3673a6b2,I73c8e83a,Ia6b838ac, ...Treehugger Robot
* changes: Check empty number before querying data ID for preferred account Fix UK numbers in international format with extra 0 Cleaned up the AndroidManifest Intent Filters. Removed NUI shortcut. Implement wifi emergency calling warning Fix CallLogGroupBuilderTest after min SDK was bumped up to N. Delete locally transcribed transcripts when transcription is turned off. Show SIM auto select reason in in call UI
2018-03-27Merge changes Ic7cb3be7,I412f8fbf,Ifebcbe87Treehugger Robot
* changes: Correctly display phone numbers containing whitespaces in RTL context. Add waiting for join banner to RTT outgoing call. Allow user to delete previous bubbles.
2018-03-27Merge changes I1e9b61d7,I2720a252,I1b162f3eTreehugger Robot
* changes: Increase minSdk to 24. Delete old search, old contacts, p13n logger, filtered numbers add number search. Add learn more info to VM Transcription setting
2018-03-26Remove TODOs left for M in the new call log as the min SDK has been bumped to N.linyuh
Bug: 72125574 Test: None. PiperOrigin-RevId: 190572832 Change-Id: I581d3c9e366a1190c1608b369700aeb511fe51d1
2018-03-26Change the maximum number of notifications per tag from 10 to 8.linyuh
For grouped notifications, the system UI only displays the last 8. Bug: 74132249 Test: NotificationThrottlerTest PiperOrigin-RevId: 190544350 Change-Id: Idc52f4e98c1262bcb16a7a5052829b0a0faaacc6
2018-03-26Replace png icon with vector drawable for voice call screen.wangqi
Icons in video call screen will be replaced in following change. Bug: 76221932 Test: manual PiperOrigin-RevId: 190534558 Change-Id: Ia8abb468c71ffa4f6322043bc3bbbbe475b20a1f
2018-03-26Fixed drag to remove favorite contacts on a few devices.calderwoodra
There were 2 issues at play here: 1) views not being able to leave the list view bounds 2) RemoveView not getting drag events. Their resolutions are: 1) add a drag drop listener to the root layout of the activity, now the view can be dragged anywhere. 2) Drag events are only sent to views that are visible, so we no longer set the remove view visibility to GONE and instead set it's contents to GONE. Bug: 76086197 Test: manual PiperOrigin-RevId: 190526568 Change-Id: I3360015f65a134a896601d6298d07163844e302c
2018-03-26Add 311910 to motorola sprint configs.twyen
Bug: 76405608 Test: TAP PiperOrigin-RevId: 190517564 Change-Id: If0de75264b9c604f6bdf9536997c95c3cee9e0b5
2018-03-26Remove obsolete methods in CompatUtils and rename it as "LocaleUtils".linyuh
Test: Existing tests PiperOrigin-RevId: 190516504 Change-Id: I5fa9e123b45beb9728257ecd160a348fb3f4732c
2018-03-26Placing a call from a search action now closes the keyboard.calderwoodra
Bug: 74784637 Test: impl PiperOrigin-RevId: 190515545 Change-Id: I70f2e6db078f3a83fc33e8493b6af143184fe736
2018-03-26Add Motorola hidden menu to all Sprint MCCMNCstwyen
Before this CL it is only added to 310120. The values are moved to the base values, and the overrides override the enabled flag instead. Multiple SPN matching is also added. Bug: 76405608 Test: TAP PiperOrigin-RevId: 190515244 Change-Id: Ia937f0300ade57dc7a1b36df1433865ee4837a23
2018-03-26Remove obsolete version checks and compat utilities after min SDK was bumped ↵linyuh
up to N. Test: Existing tests PiperOrigin-RevId: 190508397 Change-Id: Ia5f33e45af1d1cc666fec5f43efa564b2b68c193
2018-03-26Bump version codes and name to v20roldenburg
Test: n/a PiperOrigin-RevId: 190500474 Change-Id: I1d73a90bf37b36c454b2d72102193764f4e25013
2018-03-26Catch BadParcelableExceptiontwyen
This happens when an old dialer submitted a job and the newer dialer is trying to handle it. The class fingerprint changed so it can no longer be unparceled. In this CL, such tasks will be dropped. Bug: 64225192 Test: N/A PiperOrigin-RevId: 190491751 Change-Id: I90fe2d24a435201cfae09970387e9b1c3a58b094
2018-03-26Move spam setting related methods out of spam interface into a separate spamAndroid Dialer
setting interface. Test: All the existing tests PiperOrigin-RevId: 190314880 Change-Id: I030acbd70120f508c5a4616757d89113524110fa
2018-03-26Add logging support for auto blocked spam calls.Android Dialer
Test: N/A PiperOrigin-RevId: 190307083 Change-Id: Ifb0ee63d8d9c7cd247f2a2d36595e48f33fa72af
2018-03-26Switch setLabel and setLocationtwyen
Solves copy and paste error where call to setLabel and setLocation has been mixed up. Problem was introduced in: Ifb90019b6a5568788d51f4a55a07f7693c803eaf Bug: 76190741 Test: Verifies that phone number is correct in callscreen when calling contact Cherry picked from https://android-review.googlesource.com/c/platform/packages/apps/Dialer/+/648300 Bug: 76190741 Test: N/A PiperOrigin-RevId: 190305044 Change-Id: Ie268f02cabadc939e6a2e1f73ae4e126e314dc57
2018-03-26Forward extras from pre call external receivers to placeCall().twyen
All extras that CallIntentBuilder handles will be stripped and read into the builder. Other entries will be send to telecom when the intent is build. Renamed CallIntentBuilder.outGoingCallExtras for clarity. Bug: 72877810 Test: Unit tests PiperOrigin-RevId: 190301333 Change-Id: I9a8bf6664b270078d91dbfb3398f8990d243b9f8