summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2015-11-07Merge "Revert "More work to hook up screen event logging"" into ↵Yorke Lee
ub-contactsdialer-a-dev am: f58d982e72 * commit 'f58d982e72724c5da05365cdaea7b1007b9351c2': Revert "More work to hook up screen event logging"
2015-11-07Merge "Revert "More work to hook up screen event logging"" into ↵Yorke Lee
ub-contactsdialer-a-dev
2015-11-07Revert "More work to hook up screen event logging"Yorke Lee
This reverts commit 8bea0950ff04891b7aaf58bb4ca758010c813fb4. Change-Id: I1ad4cbda2dc4e6212084399fe53142e9e19dc888
2015-11-07Merge "More work to hook up screen event logging" into ub-contactsdialer-a-devYorke Lee
am: 305eb447e8 * commit '305eb447e82d5a67e7b558a769059c2e8e5842ef': More work to hook up screen event logging
2015-11-07Merge "More work to hook up screen event logging" into ub-contactsdialer-a-devYorke Lee
2015-11-06More work to hook up screen event loggingYorke Lee
* Replace inlined strings with consolidated string constants * Log event when import/export to contacts dialog is shown Bug: 23164804 Change-Id: I45ba0663f28bd7ea41c5c33c8a5106dc83cd41f3
2015-11-07Fixed getTtsSpannedPhoneNumber() name changed merge errorTa-wei Yen
am: f0017b72f4 * commit 'f0017b72f44f39448c87186e59da8e568ebc5dd1': Fixed getTtsSpannedPhoneNumber() name changed merge error
2015-11-06Fixed getTtsSpannedPhoneNumber() name changed merge errorTa-wei Yen
Change-Id: Ieedf62ce9648a611f36cbb118d626d135abef132
2015-11-06Add phone number TTS to strings that show phone numbers.Ta-wei Yen
am: 6d98cf6888 * commit '6d98cf688855372ffbef12a41ef1f69f990409f1': Add phone number TTS to strings that show phone numbers.
2015-11-06Add phone number TTS to strings that show phone numbers.Ta-wei Yen
Bug:25452669 Change-Id: I9c1685ee05f2ffc2fc6ac94714c2ae4d1137ffbe
2015-11-06Call Blocking UI/String changeTa-wei Yen
am: a5437e6882 * commit 'a5437e6882bde69cb795ed8d929c1024a8fef16e': Call Blocking UI/String change
2015-11-06Call Blocking UI/String changeTa-wei Yen
+ Adjusted UI/String according to new specifications. + Added class VisualVoicemailEnabledChecker + Block number dialog display different message depending on whether VVM is activated. Bug:25455707 Change-Id: I09425053c91a5517e309302d421beadcc2d81cd4
2015-11-06Route all existing screen view events through the LoggerYorke Lee
am: 6e0fd6b777 * commit '6e0fd6b77759baf43cb37d407041be051b4856b5': Route all existing screen view events through the Logger
2015-11-06Route all existing screen view events through the LoggerYorke Lee
* The logger is responsible for sending it to its logging implementation, and also to AnalyicsUtil. * Standardize logic for creating a tagged version of a screen name Bug: 23164804 Change-Id: I9b817fba5359f78340f2d9fdba54af9ea73cdb37
2015-11-06Merge "Blocking number takes user back to blocked numbers list" into ↵Brandon Maxwell
ub-contactsdialer-a-dev am: b031063587 * commit 'b031063587512b48a06ccab06934cecf6e0faec3': Blocking number takes user back to blocked numbers list
2015-11-06Merge "Blocking number takes user back to blocked numbers list" into ↵Brandon Maxwell
ub-contactsdialer-a-dev
2015-11-05Blocking number takes user back to blocked numbers listBrandon Maxwell
Bug:25456614 Change-Id: I6fdd34a0d619053d632e7364fc8ccaba8f8ef15f
2015-11-05Merge "Format number of new voicemail before displaying." into ↵Nancy Chen
ub-contactsdialer-a-dev am: 4bcdca9473 * commit '4bcdca947363b907640cc2e4b903a40ad046a2ab': Format number of new voicemail before displaying.
2015-11-05Merge "Format number of new voicemail before displaying." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-11-04Format number of new voicemail before displaying.Nancy Chen
Format the number of the new voicemail for display to improve readability and announce the number with individual digits in text-to-speech. Bug: 25122678 Change-Id: I96ef815db72b5b0571f9dd662d68f4f6cc6d0416
2015-11-04Merge "Changing method to public, static for use in InCallUi" into ↵Brandon Maxwell
ub-contactsdialer-a-dev am: 1201742b16 * commit '1201742b1689d95a262f3f807aebbc290ef6d544': Changing method to public, static for use in InCallUi
2015-11-04Merge "Changing method to public, static for use in InCallUi" into ↵Brandon Maxwell
ub-contactsdialer-a-dev
2015-11-04Merge "Reset voicemail playback state on special expand action." into ↵Nancy Chen
ub-contactsdialer-a-dev am: 2da9768fc8 * commit '2da9768fc85d8756d7cec48a1d8597ae073c8b3e': Reset voicemail playback state on special expand action.
2015-11-04Merge "Reset voicemail playback state on special expand action." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-11-04Merge "Fix "Cleared text" announcement when placing a call" into ↵Ta-wei Yen
ub-contactsdialer-b-dev
2015-11-04Merge "DiatactsActivity title indicate dialpad status, removed excessive ↵Ta-wei Yen
"showing item" messages." into ub-contactsdialer-a-dev
2015-11-03DiatactsActivity title indicate dialpad status, removed excessive "showing item"Ta-wei Yen
messages. + DiatactsActivity set its' title to "Phone Dialpad" or just "Phone", so user using Talkback can know the state of the activity when it is launched + SpeedDialFragment and SearchFragment no longer send accessibility events when its' content is changed. + Add AccessibilityDelegate ContentChangedFilter to filter out TYPE_WINDOW_CONTENT_CHANGED event for View. Bug:25190037 Change-Id: If1fa34cc9a5d24dec3fe261da9c071bb5388ec58
2015-11-04Fix "Cleared text" announcement when placing a callTa-wei Yen
+ Accessibility for the dialpad EditBox is temporarily disabled while DialtactsActvity.hideDialpadFragment() is called with true for clearDialpad. Bug:24570971 Change-Id: Ieeab034a65a66910c02981f7ba6505a768ddef33
2015-11-04Merge "Remove "Blocked Caller" Avatar in call detail" into ↵Ta-wei Yen
ub-contactsdialer-a-dev
2015-11-03Reset voicemail playback state on special expand action.Nancy Chen
The accessibilty delegate automatically expands the call log cards when the card is in focus. However, the voicemail state was not being reset when this happened. Make sure to reset the voicemail playback state when expanding the card in this manner. Bug: 24105523 Change-Id: Ife7535980566d7b62959767d7b72df779d275270
2015-11-03Fix for duplicate favorite contacts in speed dialYorke Lee
The incorrect column was being used to populate mContactIdIndex which was breaking the deduping logic (which is based on contactId. Bug: 25432987 Change-Id: If8c435e84d191ed012a019a800cf18abbda3d907
2015-11-03Changing method to public, static for use in InCallUiBrandon Maxwell
+ Changed ContactInfoHelper.lookUpDisplayNameAlternative to public so it's usable in InCallUi + Changed ContactInfoHelper.lookUpDisplayNamealternative to static to cut down on object creation + Added tests for lookUpDisplayNameAlternative since it is public Change-Id: Iede746655a1ca773cb0cd8cf26df665e34ab47fc
2015-11-03Remove "Blocked Caller" Avatar in call detailTa-wei Yen
+ Renamed CallDetailActivity.updatePhotoAndBlockActionItem() to updateFilteredNumberChanges() since it no longer updates the photo. Bug:25446254 Change-Id: I7f20c38927c7ec9dd247550538f3fd79abba240e
2015-11-03Remove "Blocked Caller" AvatarTa-wei Yen
Bug:25446254 Change-Id: If5bdcbc3f8c3951882667ee3abba46e1599cc68b
2015-11-02Don't try to iterate through empty cursorYorke Lee
Bug: 25429251 Change-Id: If2b4b875e3433f252a34d1afeaf3eaa3a1a3c3fc
2015-10-31Merge "Rename check method to isBlockedNumber." into ub-contactsdialer-a-devAndrew Lee
2015-10-30Fix adding a blocked number and return cause dialer to crashTa-wei Yen
+ BlockedListSearchFragment.onChangeFilteredNumberSuccess() calls activity.onBackPressed() instead of re-adding the management fragment. Original fix was lost due to a bad merge. Bug:25330660 Change-Id: Ib6d04dba55832845d145d2925cfb595237e7a19f
2015-10-30Rename check method to isBlockedNumber.Andrew Lee
+ Clearer name about functionality, and async nature. + Change it to return "false" if it fails and is trying to block an invalid number, rather than returning "true". This matches a more standard success/fail return paradigm. + Update logic for showing "invalid" message based on return value. + Simplify parameter set which it takes in; always take nubmer and countryIso, because they can be used to calculate the normalized #. Bug: 25343277 Change-Id: If6fb28a6395e207047f4b27bfac37f5c70a9bac3
2015-10-30Merge "Fix checking for invalid numbers." into ub-contactsdialer-a-devAndrew Lee
2015-10-30Fix checking for invalid numbers.Andrew Lee
Some of the checking for invalid numbers was broken by code cleanups yesterday, and blocking of numbers which can't be normalized had been allowed (which is no good). Fixing this, by unifying checks for whether or not a number can be blocked. Bug: 25343277 Change-Id: Ia631a3e53e3f9ed58e173055a5e18086d95c9d02
2015-10-30Merge "Change blocked id cache to static." into ub-contactsdialer-a-devAndrew Lee
2015-10-30Change blocked id cache to static.Andrew Lee
This "shares" the cache among multiple instances of call log fragment. This allows "clearing" the cache to propagate changes across all instances. This should also have the side benefit of fewer lookups. ~ Change to use ConcurrentHashMap, since it can now be accessed by multiple call log fragments. ~ Do a little footwork with conversion, since ConcurrentHashMap does not accept null values. Bug: 25369105 Change-Id: Id21d1f6a18017c8e0bca88e57f09c9b4b173b843
2015-10-30Speed dial respects display order prefsBrandon Maxwell
- Speed dial names change based on whether user wants first name first or last name first - Sort order preferece is respected if ContactEntries have conflicting pinned positions - Added tests for PhoneFavoritesTileAdapter.arrangeContactsByPinnedPosition method Bug:19364093 Change-Id: I81214abce572e297cc21fcb4f5a901ecad958380
2015-10-30Merge "Always hide blocked calls." into ub-contactsdialer-a-devAndrew Lee
2015-10-30Merge "Cleanup variable naming for easier reading." into ub-contactsdialer-a-devAndrew Lee
2015-10-30Always hide blocked calls.Andrew Lee
- Remove setting for show/hide. - Remove utilities and behaviors for show/hide. ~ Continue filtering blocked call types in call log (which may be marked by other applications.) ~ Change behavior after blocking call; instead of keeping the call log entry but changing the type to BLOCKED, delete it instead. + Default behavior is now to delete entries and visual voicemails of blocked calls. Bug: 25378068 Bug: 25106387 Change-Id: I8cbc419b25cce6ba39099857cffe4eb1df9d0bef
2015-10-30Merge "Restyle add button for blocked number settings." into ↵Andrew Lee
ub-contactsdialer-a-dev
2015-10-29Dismiss blocking disabled notification after touch.Andrew Lee
Before, it would linger around, even after the user had touched it and visited the settings screen. Feels like more standard behavior for it to be dismissed at this point (user has clearly seen it, and it doesn't really contain any info which needs to persist). Bug: 25377379 Change-Id: I5608a3d735fd084f4493c0fcd51d9dcedf04dc6f
2015-10-29Cleanup variable naming for easier reading.Andrew Lee
Bug: 25343277 Change-Id: I166a142f1537835b13afb2d15c0893aacda4eedd
2015-10-29Restyle add button for blocked number settings.Andrew Lee
+ Convert from button into list item with ripple feedback. - Removed divider line between list items, including the custom background drawable which used to be used to achieve the divider only for the bottom border. Bug: 25356667 Change-Id: Ic19fd8b895b7b12a140c64a945f8ac8571e0a510
2015-10-29Fix method calling itself. >_<Andrew Lee
Bug: 25368270 Change-Id: Ie668b4f6cd029260440bafaf7951957a81cd7632
2015-10-29Merge "Rename activity for blocked numbers settings." into ↵Andrew Lee
ub-contactsdialer-a-dev
2015-10-28Rename activity for blocked numbers settings.Andrew Lee
Manage is more related to a specific screen, new name seems to make more sense based on location in settings menu of application. Bug: 25343277 Change-Id: Ia45c1b7aa91c045078fd1473500f5d474e1c598f
2015-10-28Simplify FilteredNumberDialogFragment params.Andrew Lee
Reconstruct the normalized phone number from other params. Bug: 25343277 Change-Id: Ibb526b0808e0b50a4e946d91279e5570af44c3ca
2015-10-28Rename adapters to a more consistent plurality.Andrew Lee
... really, this was just bugging me. I'm not trying to just pad my CL count. ;) Bug: 25343277 Change-Id: Ifa0e894415d64f373fc23b01eb6169b5fffd98ce
2015-10-29Merge "Rename FilterNumberDialogFragment." into ub-contactsdialer-a-devAndrew Lee
2015-10-28Rename FilterNumberDialogFragment.Andrew Lee
It bugged me how it was inconsistently named to other classes (ie. FilterNumber vs FilteredNumber). It's also specific to blocked numbers, for now, so it felt more appropriate to name it accordingly. Bug: 25343277 Change-Id: I33e2f9fd933d117326690901ec71e3e8c0e3bbd3
2015-10-28Merge "Don't update on voicemail fetch if no activity." into ↵Andrew Lee
ub-contactsdialer-a-dev
2015-10-28Don't update on voicemail fetch if no activity.Andrew Lee
The right thing to do is to return early in this case. This is a theoretical fix for the tagged bug; presuming that this exception caused code execution to terminate prematurely and delete the voicemail as it would be expected to. Bug: 25346075 Change-Id: I643ff4e8abf723f3673b38f5933416730e5d5f9f
2015-10-28Merge "Call blocking normalization cleanup." into ub-contactsdialer-a-devAndrew Lee
2015-10-28Merge "Notify for call blocking disabled by E911." into ub-contactsdialer-a-devAndrew Lee
2015-10-28Notify for call blocking disabled by E911.Andrew Lee
+ Add method and listener to FilteredNumberAsyncQueryHandler to query for whether there are any blocked numbers. + Added utility function for showing a notification, which points to the blocked numbers setting screen. This notification will only be shown if the user has blocked numbers. + Add a boolean flag to track whether we have shown this notification after an emergency call. This is to address the (edge) case where the user makes an emergency call when they have not blocked any numbers, but then later blocks a number. + Added strings for notification. Bug: 25327365 Change-Id: I3179f3884271ea0a504ef8c9a61bf9dfbd18ef10
2015-10-28Merge "Tweak accessibility in for call blocking settings." into ↵Andrew Lee
ub-contactsdialer-a-dev
2015-10-28Disable call blocking for SIP numbers.Andrew Lee
Bug: 25342525 Change-Id: I9a845ffa25323b53175dc0eac2da1f2b4311abe3
2015-10-28Merge "Fix blocked numbers rotation jank." into ub-contactsdialer-a-devAndrew Lee
2015-10-28Fix blocked numbers rotation jank.Andrew Lee
+ Saved search term. + Fix padding/shadow jank between rotations. + Fix title disappearing for import on rotation. Bug: 24910704 Change-Id: Ib683bd07ad629917ac429a5f33be54ecf781e33d
2015-10-28Merge "Revert a minor voicemail playback accessibility change." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-10-28Revert a minor voicemail playback accessibility change.Nancy Chen
Discovered the bug was in the TalkBack code instead of the dialer code, this change is no longer necessary. Bug: 25127953 Change-Id: Ic02dab7ab448d4df55bb6f4d91a723805de58f32
2015-10-28Tweak accessibility in for call blocking settings.Andrew Lee
+ Adjust talkback focus to allow the user to page through the cards for the settings and import separately, even though they are structurally part of the same header component, visually they reside in different "cards". + Change the "hide setting" to be toggled by tapping on the text description area. Bug: 25163592 Change-Id: I0d1fcd28dba058d707bfe5099cdf912aed14f728
2015-10-28Call blocking normalization cleanup.Andrew Lee
- Remove unnecessary getter. + Reorganized arguments logic in FilterNumberDialogFragment. Bug: 25343277 Change-Id: I7541f21ed28794b4a5d73e0c6c6d895ca6402c77
2015-10-28Fix adding a blocked number and return cause dialer to crashTa-wei Yen
+ BlockedListSearchFragment.onChangeFilteredNumberSuccess() calls activity.onBackPressed() instead of re-adding the management fragment. Bug:25330660 Change-Id: If3a4cd26a180cf08a0e28f0c4bd05e7fd6149c20
2015-10-28Merge "Provide debug hook for call blocking / E911." into ↵Andrew Lee
ub-contactsdialer-a-dev
2015-10-27Provide debug hook for call blocking / E911.Andrew Lee
Add a systems settings config, which is checked for the delay threshold if a particular debug VERBOSE logging mode is used. Usage: adb shell setprop log.tag.DebugEmergencyCall VERBOSE adb shell settings put system dialer_emergency_call_threshold_ms 60000 Bug: 25216954 Change-Id: Ia9b179e16819d3d8232cbedd49d5744d7b69a825
2015-10-28Merge "Retain progress for voicemail playback when rebinding voicemail ↵Nancy Chen
card." into ub-contactsdialer-a-dev
2015-10-27Retain progress for voicemail playback when rebinding voicemail card.Nancy Chen
When rebinding the voicemail card, onPrepared gets called and resets the voicemail playback to 0 because mPosition is not updated to the most recent value. Update mPosition in this case to the position of the media player and then call onPrepared. Bug: 25080811 Change-Id: Ief3a021f4c11bac7b8c0a563765e14c897cb43b5
2015-10-27Remove onboarding flowYorke Lee
Straight revert of all onboarding flow related CLs - the onboarding flow is not needed for now as the Dialer will always at least be the system dialer. Bug: 25020847 Change-Id: Ic1c5020b9b423de50801485f764209b21d5d7f33
2015-10-27Merge "CallDetailActivity respect display name order" into ↵Brandon Maxwell
ub-contactsdialer-a-dev
2015-10-27Merge "Fix voicemail tab items reading "speed dial" when selected." into ↵Nancy Chen
ub-contactsdialer-a-dev
2015-10-26Fix voicemail tab items reading "speed dial" when selected.Nancy Chen
The voicemail entries were reading "speed dial" because the focus would go to the newly added "speed dial" tab since the tabs are all removed and readded when the tab info changes. Change the logic so that only the voicemail tab is changed when needed. The voicemail entry reads "seek playback" instead of the information about the voicemail because of custom expand logic for accessibilty. Change it so that only the call log items are expanded when selected (it is more important to be able to discover the overflow options). Also change content description text because it was too long and confusing. Bug: 25124120 Change-Id: I64c1b27d8c0db57525f7f4ada59655e9f8352245
2015-10-26CallDetailActivity respect display name orderBrandon Maxwell
- Updated the CallDetailActivity to choose whether to show last name first or first name first based on user preferences. - Modified callLog code to behave in a similar fashion - Fixed bug in ContactInfoHelperTests - Rename PhoneCallDetails.name -> PhoneCallDetails.namePrimary Bug: 19364093 Change-Id: I50971ad0f26f6ede49f1c82965d1b00ce0cba4d3
2015-10-26Merge "Show list of all phone numbers for empty query." into ↵Andrew Lee
ub-contactsdialer-a-dev
2015-10-26Merge "Fix issue with entering '+' with switch access" into ↵Yorke Lee
ub-contactsdialer-a-dev
2015-10-26Show list of all phone numbers for empty query.Andrew Lee
+ Configure BlockedListSearchFragment so it will not show empty when the search query is null. + Removed local reference and equality check for changes in the query string. This is done in the superclasses already, so was redundant. - Removed unnecessary override in RegularSearchFragment. Bug: 24910704 Change-Id: Ifd11eed9e3ba6fb00ba535ae019df477f81518fb
2015-10-26Fix issue with entering '+' with switch accessYorke Lee
Distinguish between a manual long press and system long press (via accessibility) when modifying the current dial string. Bug: 23554996 Change-Id: I3fc610c8e24bdb39729b827715e08a3e7d73ba1f
2015-10-26Merge "Allow voicemail numbers to be blocked." into ub-contactsdialer-a-devAndrew Lee
2015-10-26Allow voicemail numbers to be blocked.Andrew Lee
Though it is lighter on logic now, it still seems helpful to have a common helper to return whether it should be possible to proceed with blocking a number. Bug: 25230222 Change-Id: I99f93f1cfc09988b3dec77f71541463c96d06225
2015-10-26Call log respects display name order preferencesBrandon Maxwell
- Updated ContactInfoHelper to retrieve DISPLAY_NAME_ALTERNATIVE (name in last name first order) - Stored alternative name in ContactInfo object - Updated CallLogAdapter to choose between first name first and last name first when showing contact name - Added tests for ContactInfoHelper.lookupContactFromUri (changed to public method) - Fixed bug with ContactsPreferences so ChangeListener works Bug:19364093 Change-Id: I73e8d8602a54e3134ef01b3d5167d828b26fa5ea
2015-10-26Merge "Wrap call log popup title with PhoneNumber TtsSpan" into ↵Yorke Lee
ub-contactsdialer-a-dev
2015-10-23Wrap call log popup title with PhoneNumber TtsSpanYorke Lee
Bug: 25122678 Change-Id: I83a7d231b8686152c63d9be71a652232664ea682
2015-10-23Merge "Revert "Call log respects display name order preferences"" into ↵Yorke Lee
ub-contactsdialer-a-dev
2015-10-23Revert "Call log respects display name order preferences"Brandon Maxwell
This reverts commit 327fb5bb609a6bee44a62888d671c951b19782fd. Change-Id: I134f0a26697bec20b746a6e8f041a715d8e95136
2015-10-23Merge "Refresh onboarding flow UI" into ub-contactsdialer-a-devYorke Lee
2015-10-23Merge "Call log respects display name order preferences" into ↵Brandon Maxwell
ub-contactsdialer-a-dev
2015-10-23Call log respects display name order preferencesBrandon Maxwell
- Updated ContactInfoHelper to retrieve DISPLAY_NAME_ALTERNATIVE (name in last name first order) - Stored alternative name in ContactInfo object - Updated CallLogAdapter to choose between first name first and last name first when showing contact name - Added tests for ContactInfoHelper.lookupContactFromUri (changed to public method) - Fixed bug with ContactsPreferences so ChangeListener works Bug:19364093 Change-Id: I188d8fc2eccb87edbe56625c9a7537b3d5f0e19e
2015-10-22Refresh onboarding flow UIYorke Lee
- Update button styles and positioning - Update background images Bug: 24270592 Change-Id: Idaca76d25d8fc1362fb6c004ec053ac5ed618170
2015-10-21Fix NPE when plugging and unplugging earphones.Nancy Chen
Crashes because the VoicemailPlaybackPresenter is alerted when the state of the headset changes but the corresponding view may be out of focus. Bug: 25090589 Change-Id: Iabe24eb969777ae3919ede05474f35d6c596b20e
2015-10-21Merge "Prevent fragment rotation crashes." into ub-contactsdialer-a-devAndrew Lee
2015-10-21Prevent fragment rotation crashes.Andrew Lee
Also, causes right fragment to retain after rotation and recreation. Bug: 25154818 Bug: 24910704 Change-Id: Icafbc7ba6f3ad877c2d28d92e510b9afbd822b65
2015-10-21Disable call blocking after emergency call.Andrew Lee
Will be disabled for 48 hours after an emergency call. + Add utility for noting last time of an emergency call. + Add utility for comparing current time to last time of an emergency call. + If current time is within 48 hours of emergency call, display text in settings explaining why call blocking is disabled. Bug: 24418319 Change-Id: I6824340f04fae17b73f17843a9f6ef991afa0327
2015-10-21Fix scrolling in blocked numbers list.Andrew Lee
+ Add elements as header, so they scroll with the list. + Shuffle around some layouts to make this work correctly. + Replace default ListView divider with custom drawable, to achieve the desired effect of removing the divider on the first list item. + Override BlockedNumberAdapter to never report itself as empty. Otherwise, the header will disappear. + Tweak some padding. Bug: 25134186 Change-Id: I07711437fea2d3042d3987983667ab5316d51fcc