Skip to content

Commit 2b7c56d

Browse files
jkasten2jkasten2
committed
rm AdvertisingIdProviderGPS
* Removed AdvertisingIdProviderGPS and all references to it in src and tests * Also removed the AdvertisingIdentifierProvider interface as all implementations of it have been removed.
1 parent 3cb018d commit 2b7c56d

11 files changed

+0
-232
lines changed

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/AdvertisingIdProviderGPS.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/AdvertisingIdentifierProvider.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,6 @@ static OSInAppMessageController getInAppMessageController() {
432432
@Nullable private static OSOutcomeEventsFactory outcomeEventsFactory;
433433
@Nullable private static OSNotificationDataController notificationDataController;
434434

435-
@Nullable private static AdvertisingIdentifierProvider adIdProvider;
436-
437435
@SuppressWarnings("WeakerAccess")
438436
public static String sdkType = "native";
439437
private static String lastRegistrationId;

‎OneSignalSDK/unittest/src/test/java/com/onesignal/ShadowAdvertisingIdProviderGPS.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎OneSignalSDK/unittest/src/test/java/com/test/onesignal/InAppMessageIntegrationTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessage;
1818
import com.onesignal.OneSignalPackagePrivateHelper.OSTestTrigger;
1919
import com.onesignal.OneSignalPackagePrivateHelper.TestOneSignalPrefs;
20-
import com.onesignal.ShadowAdvertisingIdProviderGPS;
2120
import com.onesignal.ShadowCustomTabsClient;
2221
import com.onesignal.ShadowCustomTabsSession;
2322
import com.onesignal.ShadowDynamicTimer;
@@ -82,7 +81,6 @@
8281
ShadowPushRegistratorFCM.class,
8382
ShadowOSUtils.class,
8483
ShadowGMSLocationController.class,
85-
ShadowAdvertisingIdProviderGPS.class,
8684
ShadowCustomTabsClient.class,
8785
ShadowCustomTabsSession.class,
8886
ShadowNotificationManagerCompat.class,

‎OneSignalSDK/unittest/src/test/java/com/test/onesignal/InAppMessagingUnitTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessage;
1414
import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessageAction;
1515
import com.onesignal.OneSignalPackagePrivateHelper.OSTestTrigger;
16-
import com.onesignal.ShadowAdvertisingIdProviderGPS;
1716
import com.onesignal.ShadowCustomTabsClient;
1817
import com.onesignal.ShadowCustomTabsSession;
1918
import com.onesignal.ShadowDynamicTimer;
@@ -62,7 +61,6 @@
6261
ShadowOneSignalRestClient.class,
6362
ShadowPushRegistratorFCM.class,
6463
ShadowOSUtils.class,
65-
ShadowAdvertisingIdProviderGPS.class,
6664
ShadowCustomTabsClient.class,
6765
ShadowCustomTabsSession.class,
6866
ShadowNotificationManagerCompat.class,

‎OneSignalSDK/unittest/src/test/java/com/test/onesignal/LocationIntegrationTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.onesignal.MockSessionManager;
1919
import com.onesignal.OneSignal;
2020
import com.onesignal.OneSignalPackagePrivateHelper;
21-
import com.onesignal.ShadowAdvertisingIdProviderGPS;
2221
import com.onesignal.ShadowCustomTabsClient;
2322
import com.onesignal.ShadowCustomTabsSession;
2423
import com.onesignal.ShadowFusedLocationApiWrapper;
@@ -75,7 +74,6 @@
7574
ShadowOneSignalRestClient.class,
7675
ShadowPushRegistratorFCM.class,
7776
ShadowOSUtils.class,
78-
ShadowAdvertisingIdProviderGPS.class,
7977
ShadowCustomTabsClient.class,
8078
ShadowCustomTabsSession.class,
8179
ShadowHmsInstanceId.class,

‎OneSignalSDK/unittest/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
import com.onesignal.OneSignalPackagePrivateHelper;
6868
import com.onesignal.OneSignalShadowPackageManager;
6969
import com.onesignal.PermissionsActivity;
70-
import com.onesignal.ShadowAdvertisingIdProviderGPS;
7170
import com.onesignal.ShadowBadgeCountUpdater;
7271
import com.onesignal.ShadowCustomTabsClient;
7372
import com.onesignal.ShadowCustomTabsSession;
@@ -179,7 +178,6 @@
179178
ShadowPushRegistratorADM.class,
180179
ShadowPushRegistratorFCM.class,
181180
ShadowOSUtils.class,
182-
ShadowAdvertisingIdProviderGPS.class,
183181
ShadowCustomTabsClient.class,
184182
ShadowCustomTabsSession.class,
185183
ShadowNotificationManagerCompat.class,
@@ -314,23 +312,6 @@ public void testDeviceTypeIsAndroid_forPlayerCreate() throws Exception {
314312
assertAndroidPlayerCreateAtIndex(1);
315313
}
316314

317-
@Test
318-
public void testAndroidDoesNotGetAdId() throws Exception {
319-
// 2. Init OneSignal so the app id is cached
320-
OneSignalInit();
321-
threadAndTaskWait();
322-
323-
// 3. Make sure device_type is Amazon (2) in player create
324-
assertAndroidPlayerCreateAtIndex(1);
325-
326-
// 4. Assert Player Create does NOT have an ad_id
327-
ShadowOneSignalRestClient.Request request = ShadowOneSignalRestClient.requests.get(1);
328-
JsonAsserts.doesNotContainKeys(request.payload, new ArrayList<String>() {{ add("ad_id"); }});
329-
330-
// 5. Assert we did NOT try to get a Google Ad id
331-
assertFalse(ShadowAdvertisingIdProviderGPS.calledGetIdentifier);
332-
}
333-
334315
@Test
335316
public void testDeviceTypeIsAmazon_forPlayerCreate() throws Exception {
336317
// 1. Mock Amazon device type for this test
@@ -344,26 +325,6 @@ public void testDeviceTypeIsAmazon_forPlayerCreate() throws Exception {
344325
assertAmazonPlayerCreateAtIndex(1);
345326
}
346327

347-
@Test
348-
public void testAmazonDoesNotGetAdId() throws Exception {
349-
// 1. Mock Amazon device type for this test
350-
ShadowOSUtils.supportsADM = true;
351-
352-
// 2. Init OneSignal so the app id is cached
353-
OneSignalInit();
354-
threadAndTaskWait();
355-
356-
// 3. Make sure device_type is Amazon (2) in player create
357-
assertAmazonPlayerCreateAtIndex(1);
358-
359-
// 4. Assert Player Create does NOT have an ad_id
360-
ShadowOneSignalRestClient.Request request = ShadowOneSignalRestClient.requests.get(1);
361-
JsonAsserts.doesNotContainKeys(request.payload, new ArrayList<String>() {{ add("ad_id"); }});
362-
363-
// 5. Assert we did NOT try to get a Google Ad id
364-
assertFalse(ShadowAdvertisingIdProviderGPS.calledGetIdentifier);
365-
}
366-
367328
@Test
368329
public void testDeviceTypeIsHuawei_forPlayerCreate() throws Exception {
369330
// 1. Mock Amazon device type for this test
@@ -377,26 +338,6 @@ public void testDeviceTypeIsHuawei_forPlayerCreate() throws Exception {
377338
assertHuaweiPlayerCreateAtIndex(1);
378339
}
379340

380-
@Test
381-
public void testHuaweiDoesNotGetAdId() throws Exception {
382-
// 1. Mock Huawei device type for this test
383-
ShadowOSUtils.supportsHMS(true);
384-
385-
// 2. Init OneSignal so the app id is cached
386-
OneSignalInit();
387-
threadAndTaskWait();
388-
389-
// 3. Make sure device_type is Huawei (13) in player create
390-
assertHuaweiPlayerCreateAtIndex(1);
391-
392-
// 4. Assert Player Create does NOT have an ad_id
393-
ShadowOneSignalRestClient.Request request = ShadowOneSignalRestClient.requests.get(1);
394-
JsonAsserts.doesNotContainKeys(request.payload, new ArrayList<String>() {{ add("ad_id"); }});
395-
396-
// 5. Assert we did NOT try to get a Google Ad id
397-
assertFalse(ShadowAdvertisingIdProviderGPS.calledGetIdentifier);
398-
}
399-
400341
@Test
401342
public void testDeviceTypeIsAndroid_withoutOneSignalInit() throws Exception {
402343
// 1. Init OneSignal so the app id is cached
@@ -3291,15 +3232,6 @@ public void testNotificationOpenedProcessorHandlesEmptyIntent() {
32913232
NotificationOpenedProcessor_processFromContext(blankActivity, new Intent());
32923233
}
32933234

3294-
@Test
3295-
public void shouldOpenChromeTab() throws Exception {
3296-
OneSignalInit();
3297-
threadAndTaskWait();
3298-
3299-
assertTrue(ShadowCustomTabsClient.bindCustomTabsServiceCalled);
3300-
assertTrue(ShadowCustomTabsSession.lastURL.toString().contains("https://onesignal.com/android_frame.html?app_id=b4f7f966-d8cc-11e4-bed1-df8f05be55ba&user_id=a2f7f967-e8cc-11e4-bed1-118f05be4511&ad_id=11111111-2222-3333-4444-555555555555&cbs_id="));
3301-
}
3302-
33033235
@Test
33043236
public void shouldHandleChromeNullNewSession() throws Exception {
33053237
ShadowCustomTabsClient.nullNewSession = true;

‎OneSignalSDK/unittest/src/test/java/com/test/onesignal/NotificationLimitManagerRunner.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import com.onesignal.OneSignal;
99
import com.onesignal.OneSignalPackagePrivateHelper.NotificationLimitManager;
10-
import com.onesignal.ShadowAdvertisingIdProviderGPS;
1110
import com.onesignal.ShadowCustomTabsClient;
1211
import com.onesignal.ShadowCustomTabsSession;
1312
import com.onesignal.ShadowGenerateNotification;
@@ -41,7 +40,6 @@
4140
ShadowNotificationLimitManager.class,
4241
ShadowPushRegistratorFCM.class,
4342
ShadowOSUtils.class,
44-
ShadowAdvertisingIdProviderGPS.class,
4543
ShadowOneSignalRestClient.class,
4644
ShadowCustomTabsClient.class,
4745
ShadowCustomTabsSession.class,

‎OneSignalSDK/unittest/src/test/java/com/test/onesignal/OutcomeEventIntegrationTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.onesignal.OneSignal;
1717
import com.onesignal.OneSignalPackagePrivateHelper;
1818
import com.onesignal.OneSignalShadowPackageManager;
19-
import com.onesignal.ShadowAdvertisingIdProviderGPS;
2019
import com.onesignal.ShadowCustomTabsClient;
2120
import com.onesignal.ShadowCustomTabsSession;
2221
import com.onesignal.ShadowGMSLocationController;
@@ -89,7 +88,6 @@
8988
ShadowPushRegistratorFCM.class,
9089
ShadowGMSLocationController.class,
9190
ShadowOSUtils.class,
92-
ShadowAdvertisingIdProviderGPS.class,
9391
ShadowCustomTabsClient.class,
9492
ShadowCustomTabsSession.class,
9593
ShadowNotificationManagerCompat.class,

0 commit comments

Comments
 (0)