Move OSDeviceInfoError and handler

* Move OSDeviceInfoError and OSDeviceInfoCompletionHandler to OneSignalStateSynchronizer
* Add appropriate imports in files OneSignal.java, OneSignalStateSynchronizer and UserStateSynchronizer

Author: tanaynigam

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

@@ -49,6 +49,8 @@
 import com.onesignal.influence.domain.OSInfluence;
 import com.onesignal.language.LanguageContext;
 import com.onesignal.language.LanguageProviderAppDefined;
+import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoError;
+import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoCompletionHandler;
 import com.onesignal.outcomes.data.OSOutcomeEventsFactory;
 
 import org.json.JSONArray;
@@ -229,25 +231,6 @@ public static class SendTagsError {
       public String getMessage() { return message; }
    }
 
-   static class OSDeviceInfoError {
-      private int errorCode;
-      private String message;
-
-      OSDeviceInfoError(int errorCode, String message) {
-         this.errorCode = errorCode;
-         this.message = message;
-      }
-
-      public int getCode() { return errorCode; }
-
-      public String getMessage() { return message; }
-   }
-
-   interface OSDeviceInfoCompletionHandler {
-      void onSuccess(String results);
-      void onFailure(OSDeviceInfoError error);
-   }
-
    public static class OSLanguageError {
       private int errorCode;
       private String message;

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

@@ -60,6 +60,25 @@ public boolean isSMS() {
       }
    }
 
+   static class OSDeviceInfoError {
+      public int errorCode;
+      public String message;
+
+      OSDeviceInfoError(int errorCode, String message) {
+         this.errorCode = errorCode;
+         this.message = message;
+      }
+
+      public int getCode() { return errorCode; }
+
+      public String getMessage() { return message; }
+   }
+
+   interface OSDeviceInfoCompletionHandler {
+      void onSuccess(String results);
+      void onFailure(OSDeviceInfoError error);
+   }
+
    // Each class abstracts from UserStateSynchronizer and this will allow us to handle different channels for specific method calls and requests
    // Each time we create a new UserStateSynchronizer we should add it to the userStateSynchronizers HashMap
    // Currently we have 2 channels:
@@ -222,7 +241,7 @@ static void resetCurrentState() {
       OneSignal.setLastSessionTime(-60 * 61);
    }
 
-   static void updateDeviceInfo(JSONObject deviceInfo, OneSignal.OSDeviceInfoCompletionHandler handler) {
+   static void updateDeviceInfo(JSONObject deviceInfo, OSDeviceInfoCompletionHandler handler) {
       getPushStateSynchronizer().updateDeviceInfo(deviceInfo, handler);
       getEmailStateSynchronizer().updateDeviceInfo(deviceInfo, handler);
       getSMSStateSynchronizer().updateDeviceInfo(deviceInfo, handler);

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

@@ -8,8 +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 com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoCompletionHandler;
+import com.onesignal.OneSignalStateSynchronizer.OSDeviceInfoError;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -95,7 +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<>();
+    final private Queue<OSDeviceInfoCompletionHandler> deviceInfoCompletionHandler = new ConcurrentLinkedQueue<>();
 
     boolean hasQueuedHandlers() {
         return externalUserIdUpdateHandlers.size() > 0;
@@ -626,14 +626,14 @@ private void externalUserIdUpdateHandlersPerformOnFailure() {
 
     private void deviceInfoHandlersPerformOnSuccess() {
         String language = OneSignalStateSynchronizer.getLanguage();
-        OneSignal.OSDeviceInfoCompletionHandler handler;
+        OSDeviceInfoCompletionHandler handler;
         while ((handler = deviceInfoCompletionHandler.poll()) != null) {
             handler.onSuccess(language);
         }
     }
 
     private void deviceInfoHandlersPerformOnFailure(OSDeviceInfoError error) {
-        OneSignal.OSDeviceInfoCompletionHandler handler;
+        OSDeviceInfoCompletionHandler handler;
         while((handler = deviceInfoCompletionHandler.poll()) != null) {
             handler.onFailure(error);
         }