Renames for consistency with iOS

* OutcomeEvent to OSOutcomeEvent
* OSDeviceState package private constructor
* VERSION to getSdkVersionRaw

Author: Jeasmine

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/util/Dialog.java

@@ -20,6 +20,7 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.onesignal.OSOutcomeEvent;
 import com.onesignal.OneSignal;
 import com.onesignal.sdktest.R;
 import com.onesignal.sdktest.adapter.EnumSelectionRecyclerViewAdapter;
@@ -488,7 +489,7 @@ public void onClick(final DialogInterface dialog, int which) {
                     case OUTCOME:
                         OneSignal.sendOutcome(name, new OneSignal.OutcomeCallback() {
                             @Override
-                            public void onSuccess(@Nullable com.onesignal.OutcomeEvent outcomeEvent) {
+                            public void onSuccess(@Nullable OSOutcomeEvent outcomeEvent) {
                                 ((Activity) context).runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
@@ -502,7 +503,7 @@ public void run() {
                     case UNIQUE_OUTCOME:
                         OneSignal.sendUniqueOutcome(name, new OneSignal.OutcomeCallback() {
                             @Override
-                            public void onSuccess(@Nullable com.onesignal.OutcomeEvent outcomeEvent) {
+                            public void onSuccess(@Nullable OSOutcomeEvent outcomeEvent) {
                                 ((Activity) context).runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
@@ -522,7 +523,7 @@ public void run() {
 
                         OneSignal.sendOutcomeWithValue(name, Float.parseFloat(value), new OneSignal.OutcomeCallback() {
                             @Override
-                            public void onSuccess(@Nullable com.onesignal.OutcomeEvent outcomeEvent) {
+                            public void onSuccess(@Nullable OSOutcomeEvent outcomeEvent) {
                                 ((Activity) context).runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {

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

@@ -40,7 +40,7 @@ public class OSDeviceState {
     private final String emailUserId;
     private final String emailAddress;
 
-    public OSDeviceState(OSSubscriptionState subscriptionStatus, OSPermissionState permissionStatus, OSEmailSubscriptionState emailSubscriptionStatus) {
+    OSDeviceState(OSSubscriptionState subscriptionStatus, OSPermissionState permissionStatus, OSEmailSubscriptionState emailSubscriptionStatus) {
         areNotificationsEnabled = permissionStatus.areNotificationsEnabled();
         pushDisabled = subscriptionStatus.isPushDisabled();
         subscribed = subscriptionStatus.isSubscribed();

OneSignalSDK/onesignal/src/main/java/com/onesignal/OutcomeEvent.java renamed to OneSignalSDK/onesignal/src/main/java/com/onesignal/OSOutcomeEvent.java

@@ -11,7 +11,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class OutcomeEvent {
+public class OSOutcomeEvent {
 
     private static final String SESSION = "session";
     private static final String NOTIFICATION_IDS = "notification_ids";
@@ -25,7 +25,7 @@ public class OutcomeEvent {
     private long timestamp;
     private Float weight;
 
-    public OutcomeEvent(@NonNull OSInfluenceType session, @Nullable JSONArray notificationIds, @NonNull String name, long timestamp, float weight) {
+    public OSOutcomeEvent(@NonNull OSInfluenceType session, @Nullable JSONArray notificationIds, @NonNull String name, long timestamp, float weight) {
         this.session = session;
         this.notificationIds = notificationIds;
         this.name = name;
@@ -36,7 +36,7 @@ public OutcomeEvent(@NonNull OSInfluenceType session, @Nullable JSONArray notifi
     /**
      * Creates an OutcomeEvent from an OSOutcomeEventParams in order to work on V1 from V2
      * */
-    public static OutcomeEvent fromOutcomeEventParamsV2toOutcomeEventV1(OSOutcomeEventParams outcomeEventParams) {
+    public static OSOutcomeEvent fromOutcomeEventParamsV2toOutcomeEventV1(OSOutcomeEventParams outcomeEventParams) {
         OSInfluenceType influenceType = OSInfluenceType.UNATTRIBUTED;
         JSONArray notificationId = null;
         if (outcomeEventParams.getOutcomeSource() != null) {
@@ -50,7 +50,7 @@ public static OutcomeEvent fromOutcomeEventParamsV2toOutcomeEventV1(OSOutcomeEve
             }
         }
 
-        return new OutcomeEvent(influenceType, notificationId, outcomeEventParams.getOutcomeId(), outcomeEventParams.getTimestamp(), outcomeEventParams.getWeight());
+        return new OSOutcomeEvent(influenceType, notificationId, outcomeEventParams.getOutcomeId(), outcomeEventParams.getTimestamp(), outcomeEventParams.getWeight());
     }
 
     public OSInfluenceType getSession() {
@@ -103,7 +103,7 @@ public boolean equals(Object o) {
         if (o == null || this.getClass() != o.getClass())
             return false;
 
-        OutcomeEvent event = (OutcomeEvent) o;
+        OSOutcomeEvent event = (OSOutcomeEvent) o;
         return this.session.equals(event.session) &&
                 this.notificationIds.equals(event.notificationIds) &&
                 this.name.equals(event.name) &&

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

@@ -225,7 +225,7 @@ public void onSuccess(String response) {
 
                 // The only case where an actual success has occurred and the OutcomeEvent should be sent back
                 if (callback != null)
-                    callback.onSuccess(OutcomeEvent.fromOutcomeEventParamsV2toOutcomeEventV1(eventParams));
+                    callback.onSuccess(OSOutcomeEvent.fromOutcomeEventParamsV2toOutcomeEventV1(eventParams));
             }
 
             @Override

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

@@ -347,7 +347,10 @@ static void setInForeground(boolean inForeground) {
    private static TrackAmazonPurchase trackAmazonPurchase;
    private static TrackFirebaseAnalytics trackFirebaseAnalytics;
 
-   public static final String VERSION = "031504";
+   private static final String VERSION = "031504";
+   public static String getSdkVersionRaw() {
+      return VERSION;
+   }
 
    private static OSLogger logger = new OSLogWrapper();
    private static FocusTimeController focusTimeController = new FocusTimeController(new OSFocusTimeProcessorFactory(), logger);
@@ -3105,7 +3108,7 @@ private static boolean isValidOutcomeValue(float value) {
     *    3. Unique OutcomeEventParams already sent for UNATTRIBUTED session during session
     */
    public interface OutcomeCallback {
-      void onSuccess(@Nullable OutcomeEvent outcomeEvent);
+      void onSuccess(@Nullable OSOutcomeEvent outcomeEvent);
    }
    /*
     * End OneSignalOutcome module

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

@@ -144,7 +144,7 @@ private static Thread startHTTPConnection(String url, String method, JSONObject
          con.setUseCaches(false);
          con.setConnectTimeout(timeout);
          con.setReadTimeout(timeout);
-         con.setRequestProperty("SDK-Version", "onesignal/android/" + OneSignal.VERSION);
+         con.setRequestProperty("SDK-Version", "onesignal/android/" + OneSignal.getSdkVersionRaw());
          con.setRequestProperty("Accept", OS_ACCEPT_HEADER);
 
          if (jsonBody != null)

OneSignalSDK/onesignal/src/main/java/com/onesignal/outcomes/data/OSOutcomeEventsV1Repository.kt

@@ -2,7 +2,7 @@ package com.onesignal.outcomes.data
 
 import com.onesignal.OSLogger
 import com.onesignal.OneSignalApiResponseHandler
-import com.onesignal.OutcomeEvent
+import com.onesignal.OSOutcomeEvent
 import com.onesignal.influence.domain.OSInfluenceType
 import com.onesignal.outcomes.OSOutcomeConstants
 import com.onesignal.outcomes.domain.OSOutcomeEventParams
@@ -12,7 +12,7 @@ internal class OSOutcomeEventsV1Repository(logger: OSLogger,
                                            outcomeEventsCache: OSOutcomeEventsCache,
                                            outcomeEventsService: OutcomeEventsService) : OSOutcomeEventsRepository(logger, outcomeEventsCache, outcomeEventsService) {
     override fun requestMeasureOutcomeEvent(appId: String, deviceType: Int, eventParams: OSOutcomeEventParams, responseHandler: OneSignalApiResponseHandler) {
-        val event = OutcomeEvent.fromOutcomeEventParamsV2toOutcomeEventV1(eventParams)
+        val event = OSOutcomeEvent.fromOutcomeEventParamsV2toOutcomeEventV1(eventParams)
         when (event.session) {
             OSInfluenceType.DIRECT -> requestMeasureDirectOutcomeEvent(appId, deviceType, event, responseHandler)
             OSInfluenceType.INDIRECT -> requestMeasureIndirectOutcomeEvent(appId, deviceType, event, responseHandler)
@@ -22,7 +22,7 @@ internal class OSOutcomeEventsV1Repository(logger: OSLogger,
         }
     }
 
-    private fun requestMeasureDirectOutcomeEvent(appId: String, deviceType: Int, event: OutcomeEvent, responseHandler: OneSignalApiResponseHandler) {
+    private fun requestMeasureDirectOutcomeEvent(appId: String, deviceType: Int, event: OSOutcomeEvent, responseHandler: OneSignalApiResponseHandler) {
         try {
             event.toJSONObjectForMeasure()
                     .put(OSOutcomeConstants.APP_ID, appId)
@@ -36,7 +36,7 @@ internal class OSOutcomeEventsV1Repository(logger: OSLogger,
         }
     }
 
-    private fun requestMeasureIndirectOutcomeEvent(appId: String, deviceType: Int, event: OutcomeEvent, responseHandler: OneSignalApiResponseHandler) {
+    private fun requestMeasureIndirectOutcomeEvent(appId: String, deviceType: Int, event: OSOutcomeEvent, responseHandler: OneSignalApiResponseHandler) {
         try {
             event.toJSONObjectForMeasure()
                     .put(OSOutcomeConstants.APP_ID, appId)
@@ -50,7 +50,7 @@ internal class OSOutcomeEventsV1Repository(logger: OSLogger,
         }
     }
 
-    private fun requestMeasureUnattributedOutcomeEvent(appId: String, deviceType: Int, event: OutcomeEvent, responseHandler: OneSignalApiResponseHandler) {
+    private fun requestMeasureUnattributedOutcomeEvent(appId: String, deviceType: Int, event: OSOutcomeEvent, responseHandler: OneSignalApiResponseHandler) {
         try {
             event.toJSONObjectForMeasure()
                     .put(OSOutcomeConstants.APP_ID, appId)

OneSignalSDK/unittest/src/test/java/com/test/onesignal/DatabaseRunner.java

@@ -12,7 +12,7 @@
 import com.onesignal.OneSignalPackagePrivateHelper.InAppMessageTable;
 import com.onesignal.OneSignalPackagePrivateHelper.NotificationTable;
 import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessage;
-import com.onesignal.OutcomeEvent;
+import com.onesignal.OSOutcomeEvent;
 import com.onesignal.ShadowOneSignalDbHelper;
 import com.onesignal.StaticResetHelper;
 import com.onesignal.influence.domain.OSInfluenceChannel;
@@ -136,7 +136,7 @@ public void shouldUpgradeDbFromV3ToV4() throws Exception {
         writableDatabase.setVersion(3);
         writableDatabase.close();
 
-        OutcomeEvent event = new OutcomeEvent(OSInfluenceType.UNATTRIBUTED, new JSONArray().put("notificationId"), "name", 0, 0);
+        OSOutcomeEvent event = new OSOutcomeEvent(OSInfluenceType.UNATTRIBUTED, new JSONArray().put("notificationId"), "name", 0, 0);
         ContentValues values = new ContentValues();
         values.put(MockOSOutcomeEventsTable.COLUMN_NAME_NOTIFICATION_INFLUENCE_TYPE, event.getSession().toString().toLowerCase());
         values.put(MockOSOutcomeEventsTable.COLUMN_NAME_NOTIFICATION_IDS, event.getNotificationIds().toString());
@@ -149,7 +149,7 @@ public void shouldUpgradeDbFromV3ToV4() throws Exception {
         ShadowOneSignalDbHelper.ignoreDuplicatedFieldsOnUpgrade = true;
 
         // 4. Opening the DB will auto trigger the update.
-        List<OutcomeEvent> events = getAllOutcomesRecordsDBv5(dbHelper);
+        List<OSOutcomeEvent> events = getAllOutcomesRecordsDBv5(dbHelper);
 
         assertEquals(events.size(), 0);
 
@@ -432,7 +432,7 @@ public void shouldUpgradeDbFromV7ToV8OutcomesTable() {
 
         writableDatabase.insert(MockOSOutcomeEventsTable.TABLE_NAME, null, outcomeValues);
 
-        List<OutcomeEvent> outcomesSavedBeforeUpdate = getAllOutcomesRecordsDBv5(dbHelper);
+        List<OSOutcomeEvent> outcomesSavedBeforeUpdate = getAllOutcomesRecordsDBv5(dbHelper);
         assertEquals(1, outcomesSavedBeforeUpdate.size());
 
         writableDatabase = dbHelper.getSQLiteDatabaseWithRetries();

OneSignalSDK/unittest/src/test/java/com/test/onesignal/RESTClientRunner.java

@@ -90,7 +90,7 @@ public void testRESTClientFallbackTimeout() throws Exception {
       assertTrue(ShadowOneSignalRestClientWithMockConnection.lastConnection.getDidInterruptMockHang());
    }
 
-   private static final String SDK_VERSION_HTTP_HEADER = "onesignal/android/" + OneSignal.VERSION;
+   private static final String SDK_VERSION_HTTP_HEADER = "onesignal/android/" + OneSignal.getSdkVersionRaw();
 
    @Test
    public void SDKHeaderIsIncludedInGetCalls() throws Exception {

OneSignalSDK/unittest/src/test/java/com/test/onesignal/TestHelpers.java

@@ -24,7 +24,7 @@
 import com.onesignal.OneSignalPackagePrivateHelper.OSTestInAppMessage;
 import com.onesignal.OneSignalPackagePrivateHelper.TestOneSignalPrefs;
 import com.onesignal.OneSignalShadowPackageManager;
-import com.onesignal.OutcomeEvent;
+import com.onesignal.OSOutcomeEvent;
 import com.onesignal.ShadowAdvertisingIdProviderGPS;
 import com.onesignal.ShadowCustomTabsClient;
 import com.onesignal.ShadowDynamicTimer;
@@ -293,7 +293,7 @@ else if (type == Cursor.FIELD_TYPE_FLOAT)
       return mapList;
    }
 
-   static List<OutcomeEvent>  getAllOutcomesRecordsDBv5(OneSignalDb db) { ;
+   static List<OSOutcomeEvent>  getAllOutcomesRecordsDBv5(OneSignalDb db) { ;
       Cursor cursor = db.query(
               MockOSOutcomeEventsTable.TABLE_NAME,
               null,
@@ -305,7 +305,7 @@ else if (type == Cursor.FIELD_TYPE_FLOAT)
               null // limit
       );
 
-      List<OutcomeEvent> events = new ArrayList<>();
+      List<OSOutcomeEvent> events = new ArrayList<>();
       if (cursor.moveToFirst()) {
          do {
             String notificationIds = cursor.getString(cursor.getColumnIndex(MockOSOutcomeEventsTable.COLUMN_NAME_NOTIFICATION_IDS));
@@ -316,7 +316,7 @@ else if (type == Cursor.FIELD_TYPE_FLOAT)
             float weight = cursor.getFloat(cursor.getColumnIndex(MockOSOutcomeEventsTable.COLUMN_NAME_WEIGHT));
 
             try {
-               OutcomeEvent event = new OutcomeEvent(session, new JSONArray(notificationIds), name, timestamp, weight);
+               OSOutcomeEvent event = new OSOutcomeEvent(session, new JSONArray(notificationIds), name, timestamp, weight);
                events.add(event);
 
             } catch (JSONException e) {