Merge pull request #1326 from OneSignal/cleanup/rm_osandroidframe_and_google_ad_id_completely

Remove OneSignalChromeTabAndroidFrame & Google Ad Id Completely

Author: jkasten2

OneSignalSDK/onesignal/build.gradle

@@ -46,11 +46,6 @@ dependencies {
     // play-services-location:17.0.0 is the first version using AndroidX
     compileOnly "com.google.android.gms:play-services-location:$googleGMSVersion"
 
-    // play-services-ads-identifier:16.0.0 is the last version before going to AndroidX
-    // play-services-ads-identifier:17.0.0 is the first version using AndroidX
-    // Classes used to live in play-services-base before this
-    implementation "com.google.android.gms:play-services-ads-identifier:$googleGMSVersion"
-
     // play-services-base:16.1.0 is the last version before going to AndroidX
     // play-services-base:17.0.0 is the first version using AndroidX
     // Required for GoogleApiAvailability

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

@@ -432,8 +432,6 @@ static OSInAppMessageController getInAppMessageController() {
    @Nullable private static OSOutcomeEventsFactory outcomeEventsFactory;
    @Nullable private static OSNotificationDataController notificationDataController;
 
-   @Nullable private static AdvertisingIdentifierProvider adIdProvider;
-
    @SuppressWarnings("WeakerAccess")
    public static String sdkType = "native";
    private static String lastRegistrationId;
@@ -1398,7 +1396,6 @@ private static void registerUser() {
          public void run() {
             try {
                registerUserTask();
-               OneSignalChromeTabAndroidFrame.setup(appId, userId, AdvertisingIdProviderGPS.getLastValue(), getRemoteParams());
             } catch(JSONException t) {
                Log(LOG_LEVEL.FATAL, "FATAL Error registering device!", t);
             }
@@ -2537,8 +2534,6 @@ static void updateUserIdDependents(String userId) {
       }
 
       OneSignalStateSynchronizer.refreshSecondaryChannelState();
-
-      OneSignalChromeTabAndroidFrame.setup(appId, userId, AdvertisingIdProviderGPS.getLastValue(), getRemoteParams());
    }
 
    static void updateEmailIdDependents(String emailId) {

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

@@ -51,7 +51,7 @@ abstract class UserState {
     public static final int PUSH_STATUS_HMS_API_EXCEPTION_OTHER = -27;
     public static final int PUSH_STATUS_MISSING_HMS_PUSHKIT_LIBRARY = -28;
 
-    private static final String[] LOCATION_FIELDS = new String[] { "lat", "long", "loc_acc", "loc_type", "loc_bg", "loc_time_stamp", "ad_id"};
+    private static final String[] LOCATION_FIELDS = new String[] { "lat", "long", "loc_acc", "loc_type", "loc_bg", "loc_time_stamp" };
     private static final Set<String> LOCATION_FIELDS_SET = new HashSet<>(Arrays.asList(LOCATION_FIELDS));
 
     private String persistKey;

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

@@ -47,8 +47,7 @@ public static void load() {
          }
          return false;
       }));
-      
-      classes.add(new ClassState(OneSignalChromeTabAndroidFrame.class, null));
+
       classes.add(new ClassState(OneSignalDbHelper.class, null));
       classes.add(new ClassState(LocationController.class, null));
       classes.add(new ClassState(OSInAppMessageController.class, null));

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

@@ -17,7 +17,6 @@
 import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessage;
 import com.onesignal.OneSignalPackagePrivateHelper.OSTestTrigger;
 import com.onesignal.OneSignalPackagePrivateHelper.TestOneSignalPrefs;
-import com.onesignal.ShadowAdvertisingIdProviderGPS;
 import com.onesignal.ShadowCustomTabsClient;
 import com.onesignal.ShadowCustomTabsSession;
 import com.onesignal.ShadowDynamicTimer;
@@ -82,7 +81,6 @@
                 ShadowPushRegistratorFCM.class,
                 ShadowOSUtils.class,
                 ShadowGMSLocationController.class,
-                ShadowAdvertisingIdProviderGPS.class,
                 ShadowCustomTabsClient.class,
                 ShadowCustomTabsSession.class,
                 ShadowNotificationManagerCompat.class,

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

@@ -13,7 +13,6 @@
 import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessage;
 import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessageAction;
 import com.onesignal.OneSignalPackagePrivateHelper.OSTestTrigger;
-import com.onesignal.ShadowAdvertisingIdProviderGPS;
 import com.onesignal.ShadowCustomTabsClient;
 import com.onesignal.ShadowCustomTabsSession;
 import com.onesignal.ShadowDynamicTimer;
@@ -62,7 +61,6 @@
             ShadowOneSignalRestClient.class,
             ShadowPushRegistratorFCM.class,
             ShadowOSUtils.class,
-            ShadowAdvertisingIdProviderGPS.class,
             ShadowCustomTabsClient.class,
             ShadowCustomTabsSession.class,
             ShadowNotificationManagerCompat.class,