Merge pull request #2255 from jetie000/fix/add-amazon-purchases-3.0.5-handle

Fix: add Amazon IAP v3.0.5 handle

Author: nan-li

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

@@ -72,16 +72,22 @@ internal class TrackAmazonPurchase(
             try {
                 // iap v2.x
                 listenerHandlerObject = listenerHandlerClass.getMethod("d").invoke(null)
-            } catch (e: NullPointerException) {
+            } catch (err2x: NullPointerException) {
                 // 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
+                } catch (err303: NullPointerException) {
+                    try {
+                        // appstore v3.0.4
+                        listenerHandlerObject = listenerHandlerClass.getMethod("g").invoke(null)
+                        registerListenerOnMainThread = true
+                    } catch (err304: NoSuchMethodException) {
+                        // appstore v3.0.5
+                        listenerHandlerObject = listenerHandlerClass.getMethod("f").invoke(null)
+                        registerListenerOnMainThread = true
+                    }
                 }
             }
             val locListenerHandlerField = listenerHandlerClass.getDeclaredField("f")