| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
|
|
The previous behavior was such that users that had no numbers in the
Dialer block list still had to go through steps to migrate to the
framework blocking solution, even though there was nothing to
migrate. This changes add logic to check if the blocked list is
empty, if that's the cause the user is automatically switched to the
framework blocking solution. This check is performed only once on app
startup.
Fixes: 27704106
Change-Id: I32482003279ef2070c1ebd8b801acf637c48ba8c
(cherry picked from commit ee4e15b40f0d20b5f04f3569efa12c0d26a38645)
|
|
Change-Id: I97c8214e620378dd32f3778040f2f2b3e1cd58f0
Fix: 28068914
(cherry picked from commit 217b96bd8ccc6874d14a1be84d639ee2d9ba1802)
|
|
Looking at the trace attached to b/28142787 it looks like
CallTypeIconsView.Resources is created frequently. In my local testing
with 9 items in my call log, it was created 23 times on load and 3 more
times on scroll.
According to the trace, creating a Resources object can be expensive.
In one frame decodeBitmap was called 3 times and took 1.4 milliseconds.
This CL works around the issue by caching the Resources object. This
should be ok. The only downside of this is:
- the cache won't be updated if the DPI variant changes
- the cache won't be released if we get a memory pressure event
Bug: 28142787
Change-Id: Ibc2ef02f7c92022deabedd70b1af135a10c9df29
(cherry picked from commit 341185547f9d54566055b270f69f1b93f0301c36)
|
|
This Migrate promo is shown so users have a way to migrate to the
framework blocking solution, directly from the settings. Previously,
users would have had to block a number to be presented with the
migration dialog.
UI: http://screen/GS8TdfKrnVv
Button Pressed: http://screen/ovd6NgVmOqq
Change-Id: I9c04b8afdf7c5681e09c02c7a4f6013c94b396d9
Fixes:27703938
(cherry picked from commit 3db9bde34452552973acefad5535a2273e9968fe)
|
|
Call Log now provides the phone number that an incoming call was
received on if that number is different than the SIM subscription
number. This "via number" is appended to the Phone Account of the Call
Log entry in Dialer if it exists.
Screenshots:
- One PhoneAccount: http://screen/HuCSL0U6jU6.png
- Multiple PhoneAccounts: http://screen/pDg8F9zpMei.png
Bug: 25594198
Change-Id: I8c05ea98409e54d20493fbdb20096bf851480719
|
|
The bug is dialer queries CP2 for alternative name by lookup key of personal directory
CP2 throws IllegalArgumentException as the lookup key is not found locally
slient IllegalArgumentException since alternative name is not very important to crash dialer.
(It's a fix by reverting some changes in ag/880910)
Bug:27905000
Change-Id: I1d61f52df63d93c9c7da436c7f2da2bdf3cced0c
|
|
+ Small fix for the blocked number dialog to match mocks. See related
bug.
Change-Id: I3082cb46adb780aaa96e7d3ccd5a19688cc1845c
Fixes: 27703247
|
|
+ No message string for unblocking, same as new filtering.
+ String for blocking with new filtering
Fixes:27703247
Change-Id: I4622d9223e03e3c3f207da581ce5b28ee4aa2b42
(cherry picked from commit f0f07d585c95d2bda8a59e9dcffdb687cb21c0fa)
|
|
In ag/874775, mStateText.setText(null) is removed from
VoicemailPlaybackLayout#setClipPosition(). This caused the error in
mStateText not to be cleared after the voicemail is sucessfully loaded.
This CL adds a setSuccess() method to the layout that clears the message,
which will be called from onPrepared() once the voicemail is loaded.
Fixes:27770842
Change-Id: Ic42e40b99d36f817532dec780b63311c1967300c
(cherry picked from commit f35cf6c6311aa253d679f61b8fd43babce4a90c3)
|
|
|
|
|
|
The Dialer is no longer responsible for showing a notification that
call blocking is disabled after the user makes an emergency call.
This CL ensures that the notification isn't shown.
Change-Id: Ib87679a067831b771d99e5b2b205c84101f05fef
Fixes: 27705312
|
|
+ When new filtering is possible, we should hide the import number
settings from the blocked numbers management UI.
Bug:27705124
Change-Id: I59bf958540482fe4d1aa620e4a4bc60fdc479778
|
|
In the framework blocking, both the e164 and non-e164 formats of a
number can be blocked at the same time; these two formats will still
have the same e164 value. Since the original code expected the e164
column to be unique, in this situation the Dialer thought the number
was not blocked, resulting in a crash when attempting to block the
number a second time.
This CL changes the logic so multiple rows with the same e164 value
are expected.
Change-Id: I90995046df74b8ec2198eab1ef56a13f20dc1398
Fixes: 27724726
|
|
+ There's an edge case crash in the Dialer when initiating the
migration workflow. If the user has blocked a number in the framework
prior to migrating the Dialer and then attempts to block that number
again in the Dialer, the migration workflow starts, completes, and
then the app crashes. This is because prior to migrating, the Dialer
doesn't know that the number is blocked in the framework, allowing it
to block the same number twice.
+ Since this case is specific to the situation where an already
blocked number initiates migration, this CL fixes the problem by
checking if the number is blocked in the framework, prior to blocking
it after the migration.
Change-Id: I31c8978afb871f364e63cab5cc6da3e5fd106b29
Fixes: 27720157
|
|
+ By design, only the primary user has the capability to block
numbers.
+ This CL ensures that secondary users don't see the option to block
numbers in the call log or call details.
Change-Id: I576925510cfbef417c16910218014d9f7b7dd2a0
Fixes: 27366206
|
|
|
|
+Number is set to empty string if null
+Added 11 tests for getContactInfo method, mainly testing various
combinations of inputs
BUG=27725458
BUG=27724999
Change-Id: Ic64fbdb7490a3c07145310cf02249555bfc963a3
|
|
|
|
Return null when constructing a PhoneAccountHandle if the ComponentName
from the database is malformed.
Bug: 26684527
Change-Id: I76a3e61699e0646cdf0b715d7b3908611cdca8ff
|
|
Authority name clash is preventing GoogleDialer from installing over
AOSP dialer
Authority for FileProvider is put in donottranslate_config.xml because
it need to be shared with ContactsCommon
Bug:27685485
Change-Id: I45a51639a85a00f58385e08221cb100ac66c2069
|
|
mCurrentlyExpandedPosition is unreliable when the list is changing, use
mCurrentlyExpandedRowId to determine which item is expanded instead.
Positions stored in CallLogAdaptor are also invalidated when the list
is changing.
Bug:25283769
Change-Id: Iffca8c7d65933cfcdd12f2f3cc85170226db1c4a
|
|
nyc-dev
|
|
|
|
Bug: 26664600
Change-Id: I27d87006bf153ca57b6acc5b7177aea69e161439
|
|
Sometimes the accountComponentName and accountId field of the new
voicemail will not be populated by the voicemail source, so a
PhoneAccountHandle used to retrieve the voicemail ringtone can not be
created. Previously we fallback to the default notification sound.
In this CL we will attempt to get the voicemail ringtone from the
default phone account before falling back to notification sound.
Bug:21699149
Change-Id: Ia1c09f5aa32c000cca245c669304cacf4f792c01
|
|
Bug: 26664600
Change-Id: I64e9d1fbd825f25e23124d95b2475fdd6e0830f9
|
|
+ Rather than using a runtime flag which has to be set for the build,
this CL changes the GreatWall feature to be enableable at runtime.
Bug: 26664600
Change-Id: Ib0e3229da41a08c67076b7bd171ebbc4b35a4c69
|
|
|
|
+ This CL ensures that while the migration work is in progress, the
MigrateDialogFragment remains visible, with its buttons greyed out.
Bug: 26664600
Change-Id: Ied32d05fac46b700f14aee06d383fd2db2fa7913
|
|
+ After the user has migrated to the framework number blocking
solution, the 'Call blocking' setting needs to take them to the
system ui. The branching logic to determine which UI to open is added
in this CL.
Bug: 26664600
Change-Id: I2574f0665d3f0d3d92230e0210c69d1d10b60228
|
|
|
|
|
|
+ After upgrading to N, users need to be able to migrate their
blocked number list from the Dialer solution to the framework
solution. Prior to migrating, when a user attempts to block a number,
a Dialog is shown prompting them to migrate their numbers. Users
must migrate to continue adding numbers to their block list. Users
that decide not to migrate will still have calls and voicemails
blocked for numbers that are currently on their block list.
+ This CL implements the logic which copies users' blocked numbers
lists to the framework solution.
Bug: 26664600
Change-Id: I44dee1306b5daca6f558c81b2b58252b35013e09
|
|
nyc-dev
|
|
+Only count voicemails that are unread and have not been marked for
deletion.
BUG=27548694
Change-Id: I8d6707087bd4a400eb073ac4c2c7e2689a065052
|
|
+ When the user attempts to block a number and they haven't migrated
to the framework blocking implementation, they should be shown a
dialog that asks them to migrate. This CL introduces the Dialog that
is shown and updates the Call log and Call details to open it.
+ As part one of the change, the Dialog is shown every time the user
attempts to block or unblock a number (when the feature is enabled).
A later CL will complete this migration step to ensure that the
dialog is only shown until migration is finished.
Bug: 26664600
Change-Id: Ia4c2d504f8d98679b90d232058eb5ee6ea9b38f1
|
|
|
|
|
|
into nyc-dev
|
|
+Send intent to other applications with temporary file permission
granted
+Add voicemails folder to FileProvider paths
+When creating file in VoicemailArchiveProvider, append extension to
file name
+Check voicemail content exists before archiving it
+Refactor voicemail code
+Add tests for checking file extension
+Add tests for archiving and sharing vociemails
+Archive tab should not archive on share button press
BUG=22798485
Change-Id: Id8068aba92f7f1ca58532dca6c405cb2908841a3
|
|
+Created new class for all AsyncTasks and listener interfaces.
+Separated the archive code into separate methods
+Added 7 tests
BUG=22797391
Change-Id: I789125328bf079846e34c5fd57fd0d1c67dc6266
|
|
+ Users are shown a dialog when they're running on an SDK which
supports the framework blocking solution, but they haven't yet
migrated. In order to determine whether the user has migrated or not,
a SharedPreference value is used. In a later CL which performs the
migration, this value will be updated as the final step.
Bug: 26664600
Change-Id: I5a12be643d0fb3b52ef408215779423bf0a2ddc7
|
|
+ When new filtering is possible, we should hide the add number
button from the blocked numbers management UI.
+ Added method to FilteredNumberCompat to check if it's possible to
use the new filtering implementation. This is needed because prior
to migrating to new filtering, users need to be able to unblock
numbers. Just checking the SDK version is not sufficient, we need to
know if the user has migrated their numbers.
Bug=26664600
Change-Id: I60433465074911f13a26736221ddacc9a8bbcf88
|
|
+ We were previously hardcoding the post_dial_digits column name.
This code was written before we had src-N and src-pre-N folders.
+ This CL converts the hard coded column name to follow the pattern
we have for new stuff in the SDK.
+ Additionally, this CL removes an unneeded method which checks the
SDK version, instead using the CompatUtils class.
Bug: 25021389
Change-Id: I017d47f7efd323254e616a64d7ac824c5cfb8902
|
|
nyc-dev
|
|
+Add share icon and string
+Added share button to voicemail_playback_layout.xml
+Link to icon: https://icons.googleplex.com/#icon=ic_share
BUG=22798485
Change-Id: Iab9051f4824a4fa0eed90049a762aaac032cf3bf
|
|
The remove button will be announced when user hovers contact onto it or
drop it.
Bug: 25559343
Change-Id: I31f51f6d074d8b1721439e7a484e1e316cb006fe
|
|
Query lookup uri with work lookup key directly is not allowed, app crashes
if doing so. And actually, all APIs do not support work lookup key
except those explicitly say it does.
This Cls changed two places:
1. Do not pass lookup uri with work lookup to NotificationManager to avoid
NotificationManager using the uri to query.
2. Dialer perform query for alternative display name using lookup key.
But if it is a work contact, do not do so.
Bug: 27146678
Change-Id: Ie59c37ff43b6f953a96564c446d79d8812f5ada1
|
|
+ Our new components for creating missed call notifications are not
marked as encryption aware so Telecom was always creating the missed
call notification.
+ This CL marks the appropriate components as encryption aware so
Telecom can check to see if we support putting up the notification.
+ Updated logic so missed call notifications only have 'callback' and
'message' actions when not locked.
+ Misc FBE cleanup
+ Since the call log is not available when on the File
based encryption lock screen, dismissed notifications will not
attempt to mark the calls as read; attempting do so causes
exceptions.
+ Updated AOSP Dialer to ensure that we don't store data in device
encrypted storage by default. This storage location is always
available, regardless of whether we're in the FBE locked state
or not. None of our preferences/databases need to be available in
this state, so this change causes the Dialer to store data in
credential encrypted storage by default. This storage location is
only available when the device is unlocked.
+ Updated AOSP Dialer so it doesn't use device encrypted storage by
default. This is because we currently don't want any of the
preferences/databases stored by the Dialer to be available when
FBE locked.
+ Updated AOSP Dialer so specific components must mark themselves as
encryption aware, rather than having everything aware because the
application is marked as such.
Bug: 27455726
Change-Id: Ib5d28267116ec007bf9beb57862796235460ddf5
|
|
|
|
+ ContactPhotoLoader to create the appropriate icon from a ContactInfo
- NameLookupQuery in CallLogNotificationsHelper#getContactInfo
To show a photo the name is not enough. Full query need to be made to
retrieve the photoUri.
+ class Assert in util
+ Gradle directory setup for dialer tests
(Note: this is just for project setup in Android Studio, tests are
still not runnable in gradle)
Bug:27276108
Change-Id: I0ed2147f2bb60454fe5a5ad6c25fe99727441880
|
|
+Archive-specific actions are not drawn unless the runtime flag is
enabled
+Disable archive button and menu item
BUG=27375884
Change-Id: Ide7d0a162468279f614e09e01de99d782854a3e1
|
|
|
|
+ Populate CallLogAdapter items with different data depending on
whether it is in the voicemail archive activity or not
+ Added addVoicemailGroups method to CallLogGroupBuilder so that every
voicemail is put into an individual group
+ Voicemails grouped differently than regular calls, so added
changeCursorVoicemail in GroupingListAdapter
+Fix CallLogAdapter tests and add test for archive adapter
BUG=22797391
Change-Id: Ib8387c5b3ab8c5e39876cfaf20fde5a44295f152
|
|
+ Added VoicemailArchiveActivity which displays all voicemails archived
by the user
+ VoicemailArchivePlaybackPresenter is the same as
VoicemailPlaybackPresenter except that it does not need to request
content from the voicemail server
+Added tests (combined common methods and attributes for regular
voicemail tab and voicemail archive used for tests)
BUG=22797391
Change-Id: I4064eea945b9e257ec6c7ada35cf5ac1657dc866
|
|
nyc-dev
|
|
|
|
Bug: 25452893
Change-Id: Iae3b0a2c2db4642d7cebc74c3ae47f5ab7ad7bc2
|
|
A new method is added to show the appropriate photo and label
if the number is either blocked or spam. This occurs after the
normal photo and labels are rendered. Because of that, there is
a flickering if the photo and labels should be changed.
b/27295728 will help track the fix of the flickering bug.
Change-Id: I639c0c0d4167b48956892f2b955d4e1f0cc8e8eb
|
|
|
|
+ Previously the query for the missed calls only checked if the
calllog is_read column was equal to 1. The situation where a callog
entry exists because it was copied from another user's calllog (such
as for File based encryption), the value of is_read is null rather
than 0 or 1.
+ This CL updates the query to return those calllog entries that have
null for is_read too. This logic matches the logic for making a
calllog entry bold when it's unread.
Bug: 27168340
Change-Id: I73dba6920a3eaf352feae4d23cc3f55d51bd1efd
|
|
|
|
|
|
+Redraw voicemail tab every time notifyDataSetChanged method is called
+Remove voicemail fragment once it is disabled
BUG=23522864
Change-Id: I9cb1e6a0bbb91c38709a0ac5b8908f4f1252e509
|
|
Formerly dialer only checks for content when the view is loaded, will
only acknowledge the new content status if the fetch succeeded, and
will send a intent every time it thinks there is no content.
Suppose the server took really long to finish the fetch, but eventually
succeeds, it will cause the voicemail fetch to fail every time.
After this fix before a fetch intent is sent, content availability will
be checked first.
The following step is taken to simulate a slow fetching server:
1.disable prefetch in telephony
2.disable the content fetch on dialer load
3.set fetch timeout to 1ms
Verified a similar behavior to b/27388041. Voicemail load fails even if
the content is already there.
This fix was then applied. Voicemail fail for the first time as it should
(timeout), but plays normally after the second time.
Bug:27412247
Change-Id: I184e04fb88772f9006cf6db0fe50d6e773a45d4a
|
|
+ This CL updates the FilteredNumberAsyncQueryHandler#unblock methods
to use the FilteredNumberCompat class to properly choose between the
original Dialer blocking implementation and new blocking.
Bug=26664600
Change-Id: I528604eeafa4f7fa131cb1898d57a87708ba58b5
|
|
+ FilteredNumberAsyncQueryHandler needs to make use of the
FilteredNumberCompat class to unsure that it is
blocking/unblocking/checking the proper solution, based on which is
enabled.
+ This CL updates the queryHandler to the FilteredNumberCompat class
for the hasBlockedNumbers, isBlockedNumber, and blockNumber
operations.
Bug=26664600
Change-Id: I5ecf6e340a97e94bf696a0e6c4a7e922b791a6f5
|
|
+ FilteredNumberCompat contains the logic needed to switch between
the Dialer implemented number filtering and the new number filtering.
+ Direct uses of the Dialer Filtering code should be replaced to use
the fields in this class
Bug=26664600
Change-Id: I42db3da4b5ed124a88488713f56ccab7b2290309
|
|
Just by making its apis not 'final'.
Change-Id: Ia05b8562fc983da0fdd76b83b5240f30eb2faf7b
|
|
When swiping to a new tab, if the previous tab that the user was in was
the call history tab, all missed calls are marked as read and the tab
count is updated. Also fixes b/27153608 and clearing of missed calls on
orientation change.
BUG=27136093
BUG=27153608
BUG=27154514
Change-Id: I5be31b1a3978784b941fb8e1af22f93fb6ca944a
|
|
The number of unread missed calls are displayed beside the Call Log as a
badge. All unread missed calls are bolded under the call log tab. When
exiting the call log tab, all unread calls are marked as read. When
interacting with an unread missed call card while in the call log tab,
it will subtract 1 from the badge.
Cherry-picked from d118a8e0d8a68499398504f350f81175118e2ecf
BUG=24953555
Change-Id: If91a3bc89197465934cb773955e4bec005d6d14e
|
|
Instead of showing a 00:00 duration, nothing is displayed. When the
content is loaded, the duration field for the call log entry associated
with the voicemail is updated with the duration fetched from the
mediaplayer. The proper duration is then displayed in MM:SS format.
BUG=24175525
Change-Id: I1cafebae4fcbc749f573accfcf8833b598675f0b
(cherry picked from commit 6f3016d9065564bf09a5759f16563a05abbe105d)
|
|
The duration of the voicemail is appended to the date in a MM:SS format.
BUG=25728257
Change-Id: I9c3e392336877c2ca69707e14c6ab2eed6f2e7c6
(cherry picked from commit 3f70c27d80b2e3176159f561248f95612d66afe2)
|
|
Stores the voicemail content and call log information for all the
voicemails that have been archived.
BUG=22797391
Change-Id: I1b5d98ab17d3d6f32d6797c2c51b50bcd29cd5fa
(cherry picked from commit ca67dbe4b04a6eaaa106d40c199bc86d64d94e40)
|
|
|
|
+ MockContentProvider currently only supports mocking queries, so
the tests added are specifically for methods that perform queries.
+ Previously wasn't tested, added some tests since I'll be making
more changes to this class.
Bug=26664600
Change-Id: I901fbaa7f753cb3004102e5e912aa0481f03ccb0
|
|
Now that we're no longer backwards compatible with Lollipop we don't
need CallAudioStateCompat. See ag/870962 for more info.
Bug: 26676586
Change-Id: I7c754d89a6c9e13bf5a004b7c5b15b88b9aff9ad
|
|
This CL adds a new build-library.gradle file for AOSP dialer.
This allows the dialer to be built as a library that can be
included from GoogleDialer.
Switching to a library project meant making two other changes:
- changed all switch statements that used resources to if statements.
This was required because resource IDs are not final in library
projects.
- changed InCalUI code to import com.android.dialer.R instead of
com.android.incallui.R. See http://b.android.com/82743 for more info
on why this is required.
src-N isn't supported yet. Also, this isn't the ideal project layout.
In the future we should consider switching to the following layout:
- dialer/incallui/ <- incall UI as an independent library project
- dialer/dialerlib/ <- dialer code as an independent library project
- dialer/app <- skelent app that builds a standalone dialer AOSP app
Bug: 26676586
Change-Id: I07fbee4d33cc683539e4f8b3953c93f1427af9d7
|
|
into nyc-dev
|
|
Current dialer always queries PhoneLookup._ID and uses this as a contact
ID.
In pre-N, contact id of non-sip query is stored in PhoneLookup._ID and
it is actually a mistake. This problem does not exist in sip query,
and contact id of sip query is stored in Data.CONTACT_ID. So it is a "bug"
in dialer that we use PhoneLooup._ID for sip query as it is not really a
contacat id. The bug of missing work badge may not be the only issue
introduced by this.
In N, the issue is get fixed in framework, PhoneLookup.CONTACT_ID is
introduced. We should access PhoneLookup.CONTACT_ID no matter what
phone lookup query we are having.
The ideal case is we always use PhoneLookup.CONTACT_ID for retrieving
contact id, but given that we need to support in pre-N, we need to
query PhoneLookup._ID for contact id in non-sip query in pre-N.
BUG:27242975
Change-Id: Id14378e3dce5b07629ffe0c6e83c3d107fbb468e
|
|
|
|
This reverts commit 16be8a259c6d4c0484160d900f411b436ba10ef5.
Change-Id: Iaf0ea70a40198c483f33894cfc0b75a4cd916afb
(cherry picked from commit 0fba743c4eb9ff0832e03156c6a09fa7a15a8a40)
|
|
+ Voicemails were coming in with a null accountComponent name causing
crashes. It's unknown why this is the case. This change checks for
null prior to attempting to use these fields.
Bug=27202534
Change-Id: I48f4f188bd75aca7204d74aecfe76f2c75b730d8
|
|
Bug: 26863771
Change-Id: I048fae6cf36115f14d1b5a91e6c0c20e4130a2ae
|
|
into nyc-dev
|
|
- The smart dial search normalizes the dial string, and removes
anything other than digits.
- Original dial string contains the number which is actully entered
by user. Pass this number as it is as dialed number validation is
already taken care by APIs defined in PhoneNumberUtils.
Bug=27074055
Change-Id: Ib85750abef765ace127ebde3a13397b4dfad48fa
|
|
Getting rid of the Manager to have the ButtonRenderer directly
communicate changes to an event listener. Implementation changes
in ag/863096.
Cherry picking to nyc-dev to fix build.
Change-Id: I8061116f0b91e3f5a6a3a6eac09fe2171ebcbd5c
|
|
It is actually a naming mistake in framework, the column store contact id
of normal query is _id, but that of sip query is contact_id.
It is an old issue and we can't do much in the framework side.
So, we need to use the correct projection when it is a SIP call.
Bug:27143980
Bug:27141566
(cherry picked from commit 328f75ff518bf7d8863c6cf4446e26636e05b297)
Change-Id: I0551c308072892ef13c8cb14ea4a4ab37ffa6f83
|
|
[cherry-pick from ag/864087]
To avoid OOM, take InputStream instead byte[] as argument.
BUG=26111304
Change-Id: Ia985e58eea90c2acfd988494ea153955daa3c272
|
|
Change-Id: I2ad8e07cf6538ed7b5685b2f9695acb09a71e483
(cherry picked from commit 5c0cbaeaadf976a821128a99462beda4ac6955d7)
|
|
|
|
When performing analytics, AnalyticsUtils accesses sharedpreferences
that aren't available while File based encryption locked. This change
ensures that the AnalyticsUtil isn't initialized unless it's needed.
Bug=26822105
Change-Id: Ib35cd89a9844a75c04294cdb99e9d7b4b6448825
|
|
|
|
This manager will be in charge of events related to
the spam feature actions (blocking, unblocking, enlisting
and removing from spam list). Implementation in ag/858553
Change-Id: Ica268e1305ccc1ccbb9a5a0e27eb6a2eb1f71849
|
|
1. return complete ContactInfo in CallLogNotificationsHelper
2. use ContactInfo.userType to decide use work call title or not
BUG=26902076
Change-Id: Ic58fea1002de053ba69bc0aff06691b8a8605e64
|
|
|
