Skip to content

Commit de3d403

Browse files
committed
Remove getCurrentThreadTimeMillis method
* getCurrentThreadTimeMillis retrieves SystemClock.currentThreadTimeMillis() * CurrentThreadTimeMillis is a value that can vary between threads, is not safe to rely on it
1 parent 54d58e2 commit de3d403

File tree

4 files changed

+1
-24
lines changed

4 files changed

+1
-24
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSTime.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ public interface OSTime {
44
long getCurrentTimeMillis();
55

66
long getElapsedRealtime();
7-
8-
long getCurrentThreadTimeMillis();
97
}

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSTimeImpl.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,4 @@ public long getCurrentTimeMillis() {
1212
public long getElapsedRealtime() {
1313
return SystemClock.elapsedRealtime();
1414
}
15-
16-
@Override
17-
public long getCurrentThreadTimeMillis() {
18-
return SystemClock.currentThreadTimeMillis();
19-
}
2015
}

OneSignalSDK/unittest/src/test/java/com/onesignal/MockOSTimeImpl.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ public class MockOSTimeImpl extends OSTimeImpl {
44

55
private Long mockedTime = null;
66
private Long mockedElapsedTime = null;
7-
private Long mockedCurrentThreadTimeMillis = null;
87

98
public void reset() {
109
mockedTime = null;
1110
mockedElapsedTime = null;
12-
mockedCurrentThreadTimeMillis = null;
1311
}
1412

1513
@Override
@@ -22,11 +20,6 @@ public long getElapsedRealtime() {
2220
return mockedElapsedTime != null ? mockedElapsedTime : super.getElapsedRealtime();
2321
}
2422

25-
@Override
26-
public long getCurrentThreadTimeMillis() {
27-
return mockedCurrentThreadTimeMillis != null ? mockedCurrentThreadTimeMillis : super.getCurrentThreadTimeMillis();
28-
}
29-
3023
public void setMockedTime(Long mockedTime) {
3124
this.mockedTime = mockedTime;
3225
}
@@ -35,20 +28,11 @@ public void setMockedElapsedTime(Long mockedForegroundTime) {
3528
this.mockedElapsedTime = mockedForegroundTime;
3629
}
3730

38-
public void setMockedCurrentThreadTimeMillis(Long mockedCurrentThreadTimeMillis) {
39-
this.mockedCurrentThreadTimeMillis = mockedCurrentThreadTimeMillis;
40-
}
41-
4231
public void advanceSystemTimeBy(long sec) {
4332
long ms = sec * 1_000L;
4433
setMockedTime(getCurrentTimeMillis() + ms);
4534
}
4635

47-
public void advanceThreadTimeBy(long sec) {
48-
long ms = sec * 1_000L;
49-
setMockedCurrentThreadTimeMillis(getCurrentThreadTimeMillis() + ms);
50-
}
51-
5236
public void advanceSystemAndElapsedTimeBy(long sec) {
5337
long ms = sec * 1_000L;
5438
setMockedElapsedTime(getCurrentTimeMillis() + ms);

OneSignalSDK/unittest/src/test/java/com/test/onesignal/HMSDataMessageReceivedIntegrationTestsRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void ttl_shouldNotDisplayNotification() throws Exception {
126126
long sentTime = 1_635_971_895_940L;
127127
int ttl = 60;
128128

129-
time.setMockedCurrentThreadTimeMillis(sentTime * 1_000);
129+
time.setMockedTime(sentTime * 1_000);
130130

131131
ShadowHmsRemoteMessage.data = helperBasicOSPayload();
132132
ShadowHmsRemoteMessage.ttl = ttl;

0 commit comments

Comments
 (0)