Add DeviceInfoHandlers to UserStateSynchronizer

* Add deviceInfoCompletionHandler
* Add deviceInfoHandlersPerformOnSuccess
* Add deviceInfoHandlersPerformOnFailure

Author: tanaynigam

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

@@ -8,6 +8,8 @@
 import com.onesignal.OneSignal.ChangeTagsUpdateHandler;
 import com.onesignal.OneSignal.SendTagsError;
 import com.onesignal.OneSignalStateSynchronizer.UserStateSynchronizerType;
+import com.onesignal.OneSignal.OSDeviceInfoCompletionHandler;
+import com.onesignal.OneSignal.OSDeviceInfoError;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -37,6 +39,7 @@ abstract class UserStateSynchronizer {
     protected static final String ANDROID_PERMISSION = "androidPermission";
     protected static final String SUBSCRIBABLE_STATUS = "subscribableStatus";
     protected static final String TAGS = "tags";
+    protected static final String LANGUAGE = "language";
     protected static final String EXTERNAL_USER_ID = "external_user_id";
     protected static final String EMAIL_KEY = "email";
     protected static final String LOGOUT_EMAIL = "logoutEmail";
@@ -92,6 +95,7 @@ String getRegistrationId() {
     //    sendTags() multiple times it will call each callback
     final private Queue<ChangeTagsUpdateHandler> sendTagsHandlers = new ConcurrentLinkedQueue<>();
     final private Queue<OneSignal.OSInternalExternalUserIdUpdateCompletionHandler> externalUserIdUpdateHandlers = new ConcurrentLinkedQueue<>();
+    final private Queue<OneSignal.OSDeviceInfoCompletionHandler> deviceInfoCompletionHandler = new ConcurrentLinkedQueue<>();
 
     boolean hasQueuedHandlers() {
         return externalUserIdUpdateHandlers.size() > 0;
@@ -367,6 +371,9 @@ void onFailure(int statusCode, String response, Throwable throwable) {
                     OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR, "Error setting external user id for push with status code: "  + statusCode + " and message: " + response);
                     externalUserIdUpdateHandlersPerformOnFailure();
                 }
+
+                if (jsonBody.has(LANGUAGE))
+                    deviceInfoHandlersPerformOnFailure(new OSDeviceInfoError(statusCode, response));
             }
 
             @Override
@@ -381,6 +388,9 @@ void onSuccess(String response) {
 
                 if (jsonBody.has(EXTERNAL_USER_ID))
                     externalUserIdUpdateHandlersPerformOnSuccess();
+
+                if (jsonBody.has(LANGUAGE))
+                    deviceInfoHandlersPerformOnSuccess();
             }
         });
     }
@@ -505,7 +515,9 @@ protected UserState getUserStateForModification() {
 
     abstract protected void scheduleSyncToServer();
 
-    void updateDeviceInfo(JSONObject deviceInfo) {
+    void updateDeviceInfo(JSONObject deviceInfo, @Nullable OSDeviceInfoCompletionHandler handler) {
+        if (handler != null)
+            this.deviceInfoCompletionHandler.add(handler);
         getUserStateForModification().generateJsonDiffFromIntoSyncValued(deviceInfo, null);
     }
 
@@ -612,4 +624,18 @@ private void externalUserIdUpdateHandlersPerformOnFailure() {
         }
     }
 
+    private void deviceInfoHandlersPerformOnSuccess() {
+        String language = OneSignalStateSynchronizer.getLanguage();
+        OneSignal.OSDeviceInfoCompletionHandler handler;
+        while ((handler = deviceInfoCompletionHandler.poll()) != null) {
+            handler.onSuccess(language);
+        }
+    }
+
+    private void deviceInfoHandlersPerformOnFailure(OSDeviceInfoError error) {
+        OneSignal.OSDeviceInfoCompletionHandler handler;
+        while((handler = deviceInfoCompletionHandler.poll()) != null) {
+            handler.onFailure(error);
+        }
+    }
 }