Adding support for androidx Advertising Client (#390)

Author: milos1290

AndroidSDKCore/src/main/java/com/leanplum/internal/Util.java

@@ -36,7 +36,6 @@
 import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.provider.Settings.Secure;
-import androidx.annotation.RequiresPermission;
 import android.text.TextUtils;
 import android.util.TypedValue;
 
@@ -65,6 +64,7 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.reflect.Method;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
@@ -78,11 +78,14 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPInputStream;
 
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSocketFactory;
 
+import androidx.annotation.RequiresPermission;
+
 /**
  * Leanplum utilities.
  *
@@ -194,23 +197,40 @@ private static String getWifiMacAddressHash(Context context) {
   }
 
   /**
-   * Retrieves the advertising ID. Requires Google Play Services. Note: This method must not run on
-   * the main thread.
+   * Retrieves the advertising ID. Requires Google Play Services or androidX. Note: This method must
+   * not run on the main thread.
    */
-  private static DeviceIdInfo getAdvertisingId(Context caller) throws Exception {
+  private static DeviceIdInfo getAdvertisingId(Context caller) {
     try {
-      // Using reflection because the app will either crash or print warnings
-      // if the app doesn't link to Google Play Services, even if this method is not called.
-      Object adInfo = Class.forName("com.google.android.gms.ads.identifier.AdvertisingIdClient")
-          .getMethod("getAdvertisingIdInfo", Context.class).invoke(null, caller);
-      String id = checkDeviceId(
-          "advertising id", (String) adInfo.getClass().getMethod("getId")
+      final String[] classNames = {
+          "androidx.ads.identifier.AdvertisingIdClient",
+          "com.google.android.gms.ads.identifier.AdvertisingIdClient"
+      };
+
+      for (String name : classNames) {
+        try {
+          Object adInfo = Class.forName(name)
+              .getMethod("getAdvertisingIdInfo", Context.class)
+              .invoke(null, caller);
+
+          if (name.equals(classNames[0])) {
+            Method get = adInfo.getClass().getMethod("get", long.class, TimeUnit.class);
+            adInfo = get.invoke(adInfo, 5, TimeUnit.SECONDS);
+          }
+
+          String id = checkDeviceId("advertising id", (String) adInfo.getClass().getMethod("getId")
               .invoke(adInfo));
-      if (id != null) {
-        boolean limitTracking = (Boolean) adInfo.getClass()
-            .getMethod("isLimitAdTrackingEnabled").invoke(adInfo);
-        Log.v("Using advertising device id: " + id);
-        return new DeviceIdInfo(id, limitTracking);
+
+          if (id != null) {
+            boolean limitTracking = (Boolean) adInfo.getClass()
+                .getMethod("isLimitAdTrackingEnabled")
+                .invoke(adInfo);
+            Log.v("Using advertising device id: " + id);
+            return new DeviceIdInfo(id, limitTracking);
+          }
+        } catch (Throwable t) {
+          Log.i("Couldn't get AdvertisingID using class: " + name);
+        }
       }
     } catch (Throwable t) {
       Log.e("Error getting advertising ID. Google Play Services are not available: ", t);