Merge pull request #1416 from OneSignal/fix/null-appContext-on-getDeviceType

Check `NullPointerException` when `getDeviceType()`

Author: nan-li

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

@@ -54,18 +54,27 @@ synchronized public static OSReceiveReceiptController getInstance() {
     void sendReceiveReceipt(final CallbackToFutureAdapter.Completer<ListenableWorker.Result> callbackCompleter, @NonNull final String notificationId) {
         final String appId = OneSignal.appId == null || OneSignal.appId.isEmpty() ? OneSignal.getSavedAppId() : OneSignal.appId;
         final String playerId = OneSignal.getUserId();
-        final int deviceType = new OSUtils().getDeviceType();
+        Integer deviceType = null;
 
         if (!remoteParamController.isReceiveReceiptEnabled()) {
             OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "sendReceiveReceipt disable");
             endCallbackCompleterWithSuccess(callbackCompleter);
             return;
         }
 
+        try {
+            deviceType = new OSUtils().getDeviceType();
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+        }
+
+        final Integer finalDeviceType = deviceType;
+        OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "OSReceiveReceiptController: Device Type is: " + finalDeviceType);
+
         Runnable receiveReceiptRunnable = new Runnable() {
             @Override
             public void run() {
-                repository.sendReceiveReceipt(appId, playerId, deviceType, notificationId, new OneSignalRestClient.ResponseHandler() {
+                repository.sendReceiveReceipt(appId, playerId, finalDeviceType, notificationId, new OneSignalRestClient.ResponseHandler() {
                     @Override
                     void onSuccess(String response) {
                         OneSignal.Log(OneSignal.LOG_LEVEL.DEBUG, "Receive receipt sent for notificationID: " + notificationId);

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

@@ -28,6 +28,7 @@
 package com.onesignal;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -38,12 +39,15 @@ class OSReceiveReceiptRepository {
     private static final String PLAYER_ID = "player_id";
     private static final String DEVICE_TYPE = "device_type";
 
-    void sendReceiveReceipt(@NonNull String appId, @NonNull String playerId,  @NonNull int deviceType, @NonNull String notificationId, @NonNull OneSignalRestClient.ResponseHandler responseHandler) {
+    void sendReceiveReceipt(@NonNull String appId, @NonNull String playerId, @Nullable Integer deviceType, @NonNull String notificationId, @NonNull OneSignalRestClient.ResponseHandler responseHandler) {
         try {
             JSONObject jsonBody = new JSONObject()
                     .put(APP_ID, appId)
-                    .put(PLAYER_ID, playerId)
-                    .put(DEVICE_TYPE, deviceType);
+                    .put(PLAYER_ID, playerId);
+
+            if (deviceType != null) {
+                jsonBody.put(DEVICE_TYPE, deviceType);
+            }
 
             OneSignalRestClient.put("notifications/" + notificationId + "/report_received", jsonBody, responseHandler);
         } catch (JSONException e) {