Merge pull request #1860 from OneSignal/fix/amazon_purchase_tracking_startup

Fix Amazon purchase tracking setup

Author: nan-li

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/purchases/impl/TrackAmazonPurchase.kt

@@ -69,18 +69,25 @@ internal class TrackAmazonPurchase(
         try {
             // 2.0.1
             val listenerHandlerClass = Class.forName("com.amazon.device.iap.internal.d")
-            listenerHandlerObject = try {
+            try {
                 // iap v2.x
-                listenerHandlerClass.getMethod("d").invoke(null)
+                listenerHandlerObject = listenerHandlerClass.getMethod("d").invoke(null)
             } catch (e: NullPointerException) {
-                // appstore v3.x
-                listenerHandlerClass.getMethod("e").invoke(null)
-                registerListenerOnMainThread = true
+                // iap v3.x
+                try {
+                    // appstore v3.0.1 - v3.0.3
+                    listenerHandlerObject = listenerHandlerClass.getMethod("e").invoke(null)
+                    registerListenerOnMainThread = true
+                } catch (err: NullPointerException) {
+                    // appstore v3.0.4
+                    listenerHandlerObject = listenerHandlerClass.getMethod("g").invoke(null)
+                    registerListenerOnMainThread = true
+                }
             }
             val locListenerHandlerField = listenerHandlerClass.getDeclaredField("f")
             locListenerHandlerField.isAccessible = true
             osPurchasingListener = OSPurchasingListener(_operationRepo, _configModelStore, _identityModelStore)
-            osPurchasingListener!!.orgPurchasingListener = locListenerHandlerField.get(listenerHandlerObject) as PurchasingListener
+            osPurchasingListener!!.orgPurchasingListener = locListenerHandlerField.get(listenerHandlerObject) as PurchasingListener?
 
             listenerHandlerField = locListenerHandlerField
             canTrack = true