Simplify hasClass and rename to opaqueHasClass

The extra getName and catch housed in hasClass was not needed
after further testing.
Renamed to opaqueHasClass to provide a more specific name to what it
does.

Author: jkasten2

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

@@ -138,68 +138,61 @@ int initializationChecker(Context context, String oneSignalAppId) {
       return subscribableStatus;
    }
 
-   // Interim method that prevents proguard from making a wrong assumption that NoClassDefFoundError
-   // catches are not needed when rules include "-assumenosideeffects" with getName().
-   // -assumenosideeffects public final class java.lang.Class {
-   //    public java.lang.String getName();
-   // }
-   // Using Class instead of String as class renames would result incorrectly not finding the class
-   // Using class.getName() as if no method is called then the try-catch would be removed.
-   // This @Keep annotation is also key so this method does not get inlined
+   // Interim method that works around Proguard's overly aggressive assumenosideeffects which
+   // ignores keep rules.
+   // This is specifically designed to address Proguard removing catches for NoClassDefFoundError
+   // when the config has "-assumenosideeffects" with
+   // java.lang.Class.getName() & java.lang.Object.getClass().
+   // This @Keep annotation is key so this method does not get removed / inlined.
+   // Addresses issue https://github.com/OneSignal/OneSignal-Android-SDK/issues/1423
    @Keep
-   private static boolean hasClass(Class<?> clazz) {
-      try {
-         clazz.getName();
-         return true;
-      } catch (NoClassDefFoundError e) {
-         return false;
-      }
+   private static boolean opaqueHasClass(Class<?> _class) {
+      return true;
    }
 
    static boolean hasFCMLibrary() {
       try {
-         return hasClass(com.google.firebase.messaging.FirebaseMessaging.class);
+         return opaqueHasClass(com.google.firebase.messaging.FirebaseMessaging.class);
       } catch (NoClassDefFoundError e) {
          return false;
       }
    }
 
-   @Keep
    static boolean hasGMSLocationLibrary() {
       try {
-         return hasClass(com.google.android.gms.location.LocationListener.class);
+         return opaqueHasClass(com.google.android.gms.location.LocationListener.class);
       } catch (NoClassDefFoundError e) {
          return false;
       }
    }
 
    private static boolean hasHMSAvailabilityLibrary() {
       try {
-         return hasClass(com.huawei.hms.api.HuaweiApiAvailability.class);
+         return opaqueHasClass(com.huawei.hms.api.HuaweiApiAvailability.class);
       } catch (NoClassDefFoundError e) {
          return false;
       }
    }
 
    private static boolean hasHMSPushKitLibrary() {
       try {
-         return hasClass(com.huawei.hms.aaid.HmsInstanceId.class);
+         return opaqueHasClass(com.huawei.hms.aaid.HmsInstanceId.class);
       } catch (NoClassDefFoundError e) {
          return false;
       }
    }
 
    private static boolean hasHMSAGConnectLibrary() {
       try {
-         return hasClass(com.huawei.agconnect.config.AGConnectServicesConfig.class);
+         return opaqueHasClass(com.huawei.agconnect.config.AGConnectServicesConfig.class);
       } catch (NoClassDefFoundError e) {
          return false;
       }
    }
 
    static boolean hasHMSLocationLibrary() {
       try {
-         return hasClass(com.huawei.hms.location.LocationCallback.class);
+         return opaqueHasClass(com.huawei.hms.location.LocationCallback.class);
       } catch (NoClassDefFoundError e) {
          return false;
       }
@@ -664,4 +657,4 @@ static boolean shouldLogMissingAppIdError(@Nullable String appId) {
    static int getRandomDelay(int minDelay, int maxDelay) {
       return new Random().nextInt(maxDelay + 1 - minDelay) + minDelay;
    }
-}
+}