Comment, naming, and spacing clean up

Author: jkasten2

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

@@ -156,7 +156,7 @@ private static boolean hasHMSAvailabilityLibrary() {
       try {
          // noinspection ConstantConditions
          return com.huawei.hms.api.HuaweiApiAvailability.class != null;
-      } catch (Throwable e) {
+      } catch (Exception e) {
          return false;
       }
    }
@@ -165,7 +165,7 @@ private static boolean hasHMSPushKitLibrary() {
       try {
          // noinspection ConstantConditions
          return com.huawei.hms.aaid.HmsInstanceId.class != null;
-      } catch (Throwable e) {
+      } catch (Exception e) {
          return false;
       }
    }
@@ -174,7 +174,7 @@ private static boolean hasHMSAGConnectLibrary() {
       try {
          // noinspection ConstantConditions
          return com.huawei.agconnect.config.AGConnectServicesConfig.class != null;
-      } catch (Throwable e) {
+      } catch (Exception e) {
          return false;
       }
    }
@@ -344,7 +344,6 @@ int getDeviceType() {
       // Start - Fallback logic
       //    Libraries in the app (Google:FCM, HMS:PushKit) + Device may not have a valid combo
       // Example: App with only the FCM library in it and a Huawei device with only HMS Core
-
       if (isGMSInstalledAndEnabled())
          return UserState.DEVICE_TYPE_ANDROID;
 

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

@@ -53,7 +53,7 @@ public void run() {
     }
 
     private synchronized void getHMSTokenTask(@NonNull Context context, @NonNull RegisteredHandler callback) throws ApiException {
-        // If here is required to prevent AGConnectServicesConfig or HmsInstanceId used below
+        // Check 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);

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

@@ -21,10 +21,12 @@ public boolean supportsADM() {
    boolean hasFCMLibrary() {
       return hasFCMLibrary;
    }
+
    public static boolean hasGCMLibrary;
    public static boolean hasGCMLibrary() {
       return hasGCMLibrary;
    }
+
    public static boolean isGMSInstalledAndEnabled;
    public static boolean isGMSInstalledAndEnabled() {
       return isGMSInstalledAndEnabled;
@@ -35,10 +37,12 @@ public static boolean isGMSInstalledAndEnabled() {
    public static boolean hasHMSAvailability() {
       return hasHMSAvailability;
    }
+
    public static boolean hasHMSPushKitLibrary;
    public static boolean hasHMSPushKitLibrary() {
       return hasHMSPushKitLibrary;
    }
+
    public static boolean hasHMSAGConnectLibrary;
    public static boolean hasHMSAGConnectLibrary() {
       return hasHMSAGConnectLibrary;
@@ -48,20 +52,21 @@ public static boolean hasHMSAGConnectLibrary() {
    public static boolean isHMSCoreInstalledAndEnabled() {
       return isHMSCoreInstalledAndEnabled;
    }
+
    public static boolean isHMSCoreInstalledAndEnabledFallback() {
       return isHMSCoreInstalledAndEnabled;
    }
 
-   public static void hasAllRecommendHMSLibraries(boolean value) {
+   public static void hasAllRecommendedHMSLibraries(boolean value) {
       // required
       hasHMSPushKitLibrary = value;
       hasHMSAGConnectLibrary = value;
-      // recommend
+      // recommended
       hasHMSAvailability = value;
    }
 
    public static void supportsHMS(boolean value) {
-      hasAllRecommendHMSLibraries(value);
+      hasAllRecommendedHMSLibraries(value);
       isHMSCoreInstalledAndEnabled = true;
    }
 

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

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