Use Clock interface #5907
Merged
Use Clock interface #5907
Conversation
This file contains 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
bmarty
requested review from
a team,
ganfra,
Florian14 and
ouchadam
and removed request for
a team
ouchadam
reviewed
May 3, 2022
| @@ -48,13 +50,18 @@ class AttachmentEncryptionTest { | |||
| inputStream = if (inputAsByteArray.isEmpty()) { | |||
| inputAsByteArray.inputStream() | |||
| } else { | |||
| val memoryFile = MemoryFile("file" + System.currentTimeMillis(), inputAsByteArray.size) | |||
| val memoryFile = MemoryFile("file_" + UUID.randomUUID(), inputAsByteArray.size) | |||
ouchadam
reviewed
May 3, 2022
| // The unique queue id will stay the same as long as this object is instanciated | ||
| val queueSuffixApp = System.currentTimeMillis() | ||
| // The unique queue id will stay the same as long as this object is instantiated | ||
| private val queueSuffixApp = UUID.randomUUID() |
ouchadam
reviewed
May 3, 2022
|
|
||
| ### Use the Clock interface, or use `measureTimeMillis` | ||
| System\.currentTimeMillis\(\)===2 |
ouchadam
reviewed
May 3, 2022
| override fun doWork(): Result { | ||
| Timber.d("## Sync: RestartWhenNetworkOn.doWork()") | ||
| val sessionId = inputData.getString(KEY_SESSION_ID) ?: return Result.failure() | ||
| val syncTimeoutSeconds = inputData.getInt(KEY_SYNC_TIMEOUT_SECONDS, BackgroundSyncMode.DEFAULT_SYNC_TIMEOUT_SECONDS) | ||
| val syncDelaySeconds = inputData.getInt(KEY_SYNC_DELAY_SECONDS, BackgroundSyncMode.DEFAULT_SYNC_DELAY_SECONDS) | ||
| val isPeriodic = inputData.getBoolean(KEY_IS_PERIODIC, false) | ||
|
|
||
| // Not sure how to inject a Clock here | ||
| val clock = DefaultClock() |
There was a problem hiding this comment.
we would need to provide this worker via factory like https://github.com/vector-im/element-android/blob/develop/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt#L46
I'm not sure it's worth the effort for just the clock dependency
There was a problem hiding this comment.
Yes, I do not think it deserves it. The factory does not exist yet, since this is the only Worker we have on the app side (I think).
ouchadam
reviewed
May 3, 2022
| MEDIA_SAVING_3_DAYS -> System.currentTimeMillis() / 1000 - 3 * 24 * 60 * 60 | ||
| MEDIA_SAVING_1_WEEK -> System.currentTimeMillis() / 1000 - 7 * 24 * 60 * 60 | ||
| MEDIA_SAVING_1_MONTH -> System.currentTimeMillis() / 1000 - 30 * 24 * 60 * 60 | ||
| MEDIA_SAVING_3_DAYS -> clock.epochMillis() / 1000 - 3 * 24 * 60 * 60 |
There was a problem hiding this comment.
not for this PR, I could imagine in the future a ClockExtensions for these types of helpers
ouchadam
approved these changes
May 3, 2022
…face (#4562) Sometimes move to UUID or Random numbers instead.
Florian14
approved these changes
May 3, 2022
...src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRequestCancellation.kt
Outdated
Show resolved
Hide resolved
...roid/src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingRoomKeyRequest.kt
Outdated
Show resolved
Hide resolved
.../src/main/java/org/matrix/android/sdk/api/session/crypto/model/IncomingSecretShareRequest.kt
Outdated
Show resolved
Hide resolved
...sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXMegolmExportEncryption.kt
Show resolved
Hide resolved
...r/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.kt
Outdated
Show resolved
Hide resolved
bmarty
force-pushed
the
feature/bma/currentTimeMillis
branch
from
e35de99 to
8602cbb
Compare
ganfra
approved these changes
May 4, 2022
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.
Type of change
Content
Clockinterface instead of direct usage ofSystem.currentTimeMillis()UUIDorRandom.nextLong(), when this is not strictly required to have a timestamp.DefaultClock.Closes #4562
Motivation and context
Be able to speed up test! See #4562
Screenshots / GIFs
Tests
Tested devices
Reviewers
CC @ouchadam who opened the original issue.