Added missing HMS PushKit library detection

* Now correctly handles reporting missing HMS PushKit library if app
is running on an HMS only device.

Author: jkasten2

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

@@ -152,7 +152,7 @@ private static boolean hasGCMLibrary() {
       }
    }
 
-   private boolean hasHMSAvailability() {
+   private static boolean hasHMSAvailabilityLibrary() {
       try {
          // noinspection ConstantConditions
          return com.huawei.hms.api.HuaweiApiAvailability.class != null;
@@ -161,7 +161,7 @@ private boolean hasHMSAvailability() {
       }
    }
 
-   private boolean hasHMSPushKitLibrary() {
+   private static boolean hasHMSPushKitLibrary() {
       try {
          // noinspection ConstantConditions
          return com.huawei.hms.aaid.HmsInstanceId.class != null;
@@ -170,6 +170,21 @@ private boolean hasHMSPushKitLibrary() {
       }
    }
 
+   private static boolean hasHMSAGConnectLibrary() {
+      try {
+         // noinspection ConstantConditions
+         return com.huawei.agconnect.config.AGConnectServicesConfig.class != null;
+      } catch (Throwable e) {
+         return false;
+      }
+   }
+
+   static boolean hasAllHMSLibrariesForPushKit() {
+      // NOTE: hasHMSAvailabilityLibrary technically is not required,
+      //   just used as recommend way to detect if "HMS Core" app exists and is enabled
+      return hasHMSAGConnectLibrary() && hasHMSPushKitLibrary();
+   }
+
    Integer checkForGooglePushLibrary() {
       boolean hasFCMLibrary = hasFCMLibrary();
       boolean hasGCMLibrary = hasGCMLibrary();
@@ -286,8 +301,8 @@ private boolean supportsADM() {
    }
 
    private boolean supportsHMS() {
-      // 1. App must have the HMSAvailability and PushKit libraries to support HMS push
-      if (!hasHMSAvailability() || !hasHMSPushKitLibrary())
+      // 1. App should have the HMSAvailability for best detection and must have PushKit libraries
+      if (!hasHMSAvailabilityLibrary() || !hasAllHMSLibrariesForPushKit())
          return false;
 
       // 2. Device must have HMS Core installed and enabled

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

@@ -53,8 +53,12 @@ public void run() {
     }
 
     private synchronized void getHMSTokenTask(@NonNull Context context, @NonNull RegisteredHandler callback) throws ApiException {
-        // TODO: See if we can handle an exact message like this
-        // 2020-04-14 23:06:36.164 1565-1743/com.onesignal.example E/HMSSDK_Util: In getMetaDataAppId, Failed to read meta data for the AppID.
+        // If here is required to prevent AGConnectServicesConfig or HmsInstanceId used below
+        //   from throwing a ClassNotFoundException
+        if (!OSUtils.hasAllHMSLibrariesForPushKit()) {
+            callback.complete(null, UserState.PUSH_STATUS_MISSING_HMS_PUSHKIT_LIBRARY);
+            return;
+        }
 
         String appId = AGConnectServicesConfig.fromContext(context).getString(HMS_CLIENT_APP_ID);
         HmsInstanceId hmsInstanceId = HmsInstanceId.getInstance(context);

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

@@ -34,6 +34,7 @@ abstract class UserState {
     // Check that there is "apply plugin: 'com.huawei.agconnect'" in your app/build.gradle
     public static final int PUSH_STATUS_HMS_ARGUMENTS_INVALID = -26;
     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 Set<String> LOCATION_FIELDS_SET = new HashSet<>(Arrays.asList(LOCATION_FIELDS));

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

@@ -32,13 +32,18 @@ public static boolean isGMSInstalledAndEnabled() {
 
    // Huawei: HMS
    public static boolean hasHMSAvailability;
-   public boolean hasHMSAvailability() {
+   public static boolean hasHMSAvailability() {
       return hasHMSAvailability;
    }
    public static boolean hasHMSPushKitLibrary;
-   public boolean hasHMSPushKitLibrary() {
+   public static boolean hasHMSPushKitLibrary() {
       return hasHMSPushKitLibrary;
    }
+   public static boolean hasHMSAGConnectLibrary;
+   public static boolean hasHMSAGConnectLibrary() {
+      return hasHMSAGConnectLibrary;
+   }
+
    public static boolean isHMSCoreInstalledAndEnabled;
    public static boolean isHMSCoreInstalledAndEnabled() {
       return isHMSCoreInstalledAndEnabled;
@@ -47,9 +52,16 @@ public static boolean isHMSCoreInstalledAndEnabledFallback() {
       return isHMSCoreInstalledAndEnabled;
    }
 
+   public static void hasAllRecommendHMSLibraries(boolean value) {
+      // required
+      hasHMSPushKitLibrary = value;
+      hasHMSAGConnectLibrary = value;
+      // recommend
+      hasHMSAvailability = value;
+   }
+
    public static void supportsHMS(boolean value) {
-      hasHMSPushKitLibrary = true;
-      hasHMSAvailability = true;
+      hasAllRecommendHMSLibraries(value);
       isHMSCoreInstalledAndEnabled = true;
    }
 
@@ -66,6 +78,7 @@ public static void resetStatics() {
       isGMSInstalledAndEnabled = false;
       hasHMSAvailability = false;
       hasHMSPushKitLibrary = false;
+      hasHMSAGConnectLibrary = false;
       isHMSCoreInstalledAndEnabled = false;
 
    }

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

@@ -83,8 +83,7 @@ public void GCMAndGMSEnabled_isAndroid() {
     @Test
     public void supportedHMS_isHuawei() {
         ShadowOSUtils.isHMSCoreInstalledAndEnabled = true;
-        ShadowOSUtils.hasHMSAvailability = true;
-        ShadowOSUtils.hasHMSPushKitLibrary = true;
+        ShadowOSUtils.hasAllRecommendHMSLibraries(true);
 
         assertEquals(DEVICE_TYPE_HUAWEI, getDeviceType());
     }
@@ -95,8 +94,7 @@ public void supportsFCMAndHMS_PreferAndroid() {
         ShadowOSUtils.hasFCMLibrary = true;
 
         ShadowOSUtils.isHMSCoreInstalledAndEnabled = true;
-        ShadowOSUtils.hasHMSAvailability = true;
-        ShadowOSUtils.hasHMSPushKitLibrary = true;
+        ShadowOSUtils.hasAllRecommendHMSLibraries(true);
 
         // Prefer Google Services over Huawei if both available
         assertEquals(DEVICE_TYPE_ANDROID, getDeviceType());
@@ -108,8 +106,7 @@ public void hasFCMButNoGMSOnDeviceAndHasHMS_isHuawei() {
         ShadowOSUtils.hasFCMLibrary = true;
 
         ShadowOSUtils.isHMSCoreInstalledAndEnabled = true;
-        ShadowOSUtils.hasHMSAvailability = true;
-        ShadowOSUtils.hasHMSPushKitLibrary = true;
+        ShadowOSUtils.hasAllRecommendHMSLibraries(true);
 
         // Use HMS since device does not have the "Google Play services" app or it is disabled
         assertEquals(DEVICE_TYPE_HUAWEI, getDeviceType());