Skip to content

Commit df5c1a3

Browse files
mikechochmikechoch
committed
Updates to SDK for 2.10.0 release
* Minor cleanup on function names and code syntax
1 parent 67f3b94 commit df5c1a3

File tree

7 files changed

+101
-107
lines changed

7 files changed

+101
-107
lines changed

‎OneSignalExample/Assets/OneSignal/Example/GameControllerExample.cs

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class GameControllerExample : MonoBehaviour {
3939

4040
private static bool requiresUserPrivacyConsent = false;
4141

42-
void Start () {
42+
void Start() {
4343
extraMessage = null;
4444

4545
// Enable line below to debug issues with setuping OneSignal. (logLevel, visualLogLevel)
@@ -54,7 +54,7 @@ void Start () {
5454
// Call before using any other methods on OneSignal (except setLogLevel or SetRequiredUserPrivacyConsent)
5555
// Should only be called once when your app is loaded.
5656
// OneSignal.Init(OneSignal_AppId);
57-
OneSignal.StartInit("77e32082-ea27-42e3-a898-c72e141824ef")
57+
OneSignal.StartInit("99015f5e-87b1-462e-a75b-f99bf7c2822e")
5858
.HandleNotificationReceived(HandleNotificationReceived)
5959
.HandleNotificationOpened(HandleNotificationOpened)
6060
.HandleInAppMessageClicked(HandlerInAppMessageClicked)
@@ -99,33 +99,29 @@ private void OneSignalInAppMessageTriggerExamples() {
9999
private void OneSignalOutcomeEventsExamples() {
100100
OneSignal.SendOutcome("normal_1");
101101
OneSignal.SendOutcome("normal_2", (OSOutcomeEvent outcomeEvent) => {
102-
Console.WriteLine(outcomeEvent.session + "\n" +
103-
string.Join(", ", outcomeEvent.notificationIds) + "\n" +
104-
outcomeEvent.name + "\n" +
105-
outcomeEvent.timestamp + "\n" +
106-
outcomeEvent.weight);
102+
printOutcomeEvent(outcomeEvent);
107103
});
108104

109105
OneSignal.SendUniqueOutcome("unique_1");
110106
OneSignal.SendUniqueOutcome("unique_2", (OSOutcomeEvent outcomeEvent) => {
111-
Console.WriteLine(outcomeEvent.session + "\n" +
112-
string.Join(", ", outcomeEvent.notificationIds) + "\n" +
113-
outcomeEvent.name + "\n" +
114-
outcomeEvent.timestamp + "\n" +
115-
outcomeEvent.weight);
107+
printOutcomeEvent(outcomeEvent);
116108
});
117109

118110
OneSignal.SendOutcomeWithValue("value_1", 3.2f);
119111
OneSignal.SendOutcomeWithValue("value_2", 3.2f, (OSOutcomeEvent outcomeEvent) => {
120-
Console.WriteLine(outcomeEvent.session + "\n" +
112+
printOutcomeEvent(outcomeEvent);
113+
});
114+
}
115+
116+
private void printOutcomeEvent(OSOutcomeEvent outcomeEvent) {
117+
Console.WriteLine(outcomeEvent.session + "\n" +
121118
string.Join(", ", outcomeEvent.notificationIds) + "\n" +
122119
outcomeEvent.name + "\n" +
123120
outcomeEvent.timestamp + "\n" +
124121
outcomeEvent.weight);
125-
});
126-
}
122+
}
127123

128-
private void OneSignal_subscriptionObserver(OSSubscriptionStateChanges stateChanges) {
124+
private void OneSignal_subscriptionObserver(OSSubscriptionStateChanges stateChanges) {
129125
Debug.Log("SUBSCRIPTION stateChanges: " + stateChanges);
130126
Debug.Log("SUBSCRIPTION stateChanges.to.userId: " + stateChanges.to.userId);
131127
Debug.Log("SUBSCRIPTION stateChanges.to.subscribed: " + stateChanges.to.subscribed);
@@ -196,7 +192,7 @@ public static void HandlerInAppMessageClicked(OSInAppMessageAction action) {
196192

197193
// Test Menu
198194
// Includes SendTag/SendTags, getting the userID and pushToken, and scheduling an example notification
199-
void OnGUI () {
195+
void OnGUI() {
200196
GUIStyle customTextSize = new GUIStyle("button");
201197
customTextSize.fontSize = 30;
202198

‎OneSignalExample/Assets/OneSignal/src/OneSignal.cs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public static event PermissionObservable permissionObserver {
258258
internalPermissionObserver -= value;
259259
if (addedPermissionObserver && internalPermissionObserver.GetInvocationList().Length == 0) {
260260
addedPermissionObserver = false;
261-
oneSignalPlatform.removePermissionObserver();
261+
oneSignalPlatform.RemovePermissionObserver();
262262
}
263263
}
264264
}
@@ -268,7 +268,7 @@ public static event PermissionObservable permissionObserver {
268268
private static void addPermissionObserver() {
269269
if (!addedPermissionObserver && internalPermissionObserver != null && internalPermissionObserver.GetInvocationList().Length > 0) {
270270
addedPermissionObserver = true;
271-
oneSignalPlatform.addPermissionObserver();
271+
oneSignalPlatform.AddPermissionObserver();
272272
}
273273
}
274274

@@ -285,7 +285,7 @@ public static event SubscriptionObservable subscriptionObserver {
285285
if (oneSignalPlatform != null) {
286286
internalSubscriptionObserver -= value;
287287
if (addedSubscriptionObserver && internalSubscriptionObserver.GetInvocationList().Length == 0)
288-
oneSignalPlatform.removeSubscriptionObserver();
288+
oneSignalPlatform.RemoveSubscriptionObserver();
289289
}
290290
}
291291
}
@@ -294,7 +294,7 @@ public static event SubscriptionObservable subscriptionObserver {
294294
private static void addSubscriptionObserver() {
295295
if (!addedSubscriptionObserver && internalSubscriptionObserver != null && internalSubscriptionObserver.GetInvocationList().Length > 0) {
296296
addedSubscriptionObserver = true;
297-
oneSignalPlatform.addSubscriptionObserver();
297+
oneSignalPlatform.AddSubscriptionObserver();
298298
}
299299
}
300300

@@ -311,7 +311,7 @@ public static event EmailSubscriptionObservable emailSubscriptionObserver {
311311
if (oneSignalPlatform != null) {
312312
internalEmailSubscriptionObserver -= value;
313313
if (addedEmailSubscriptionObserver && internalEmailSubscriptionObserver.GetInvocationList().Length == 0)
314-
oneSignalPlatform.removeEmailSubscriptionObserver();
314+
oneSignalPlatform.RemoveEmailSubscriptionObserver();
315315
}
316316
}
317317
}
@@ -320,7 +320,7 @@ public static event EmailSubscriptionObservable emailSubscriptionObserver {
320320
private static void addEmailSubscriptionObserver() {
321321
if (!addedEmailSubscriptionObserver && internalEmailSubscriptionObserver != null && internalEmailSubscriptionObserver.GetInvocationList().Length > 0) {
322322
addedEmailSubscriptionObserver = true;
323-
oneSignalPlatform.addEmailSubscriptionObserver();
323+
oneSignalPlatform.AddEmailSubscriptionObserver();
324324
}
325325
}
326326

@@ -561,7 +561,7 @@ public static void RegisterForPushNotifications() {
561561
public static void PromptForPushNotificationsWithUserResponse(PromptForPushNotificationsUserResponse inDelegate) {
562562
#if ONESIGNAL_PLATFORM
563563
notificationUserResponseDelegate = inDelegate;
564-
oneSignalPlatform.promptForPushNotificationsWithUserResponse();
564+
oneSignalPlatform.PromptForPushNotificationsWithUserResponse();
565565
#endif
566566
}
567567

@@ -693,7 +693,7 @@ public static void PromptLocation() {
693693

694694
public static OSPermissionSubscriptionState GetPermissionSubscriptionState() {
695695
#if ONESIGNAL_PLATFORM
696-
return oneSignalPlatform.getPermissionSubscriptionState();
696+
return oneSignalPlatform.GetPermissionSubscriptionState();
697697
#else
698698
var state = new OSPermissionSubscriptionState();
699699
state.permissionStatus = new OSPermissionState();
@@ -805,10 +805,7 @@ public static void SendUniqueOutcome(string name, OnSendOutcomeSuccess onSendOut
805805

806806
public static void SendOutcomeWithValue(string name, float value) {
807807
#if ONESIGNAL_PLATFORM
808-
// TODO: Only implemented for Android currently
809-
#if UNITY_ANDROID
810-
oneSignalPlatform.SendOutcomeWithValue(null, name, value);
811-
#endif
808+
oneSignalPlatform.SendOutcomeWithValue(null, name, value);
812809
#endif
813810
}
814811

@@ -1140,19 +1137,19 @@ private void onSendOutcomeSuccess(string jsonString) {
11401137

11411138
// Called from native SDK
11421139
private void onOSPermissionChanged(string stateChangesJSONString) {
1143-
OSPermissionStateChanges stateChanges = oneSignalPlatform.parseOSPermissionStateChanges(stateChangesJSONString);
1140+
OSPermissionStateChanges stateChanges = oneSignalPlatform.ParseOSPermissionStateChanges(stateChangesJSONString);
11441141
internalPermissionObserver(stateChanges);
11451142
}
11461143

11471144
// Called from native SDK
11481145
private void onOSSubscriptionChanged(string stateChangesJSONString) {
1149-
OSSubscriptionStateChanges stateChanges = oneSignalPlatform.parseOSSubscriptionStateChanges(stateChangesJSONString);
1146+
OSSubscriptionStateChanges stateChanges = oneSignalPlatform.ParseOSSubscriptionStateChanges(stateChangesJSONString);
11501147
internalSubscriptionObserver(stateChanges);
11511148
}
11521149

11531150
// Called from native SDK
11541151
private void onOSEmailSubscriptionChanged(string stateChangesJSONString) {
1155-
OSEmailSubscriptionStateChanges stateChanges = oneSignalPlatform.parseOSEmailSubscriptionStateChanges(stateChangesJSONString);
1152+
OSEmailSubscriptionStateChanges stateChanges = oneSignalPlatform.ParseOSEmailSubscriptionStateChanges(stateChangesJSONString);
11561153
internalEmailSubscriptionObserver(stateChanges);
11571154
}
11581155

‎OneSignalExample/Assets/OneSignal/src/OneSignalAndroid.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ public void IdsAvailable(string delegateId) {
7272
}
7373

7474
// Doesn't apply to Android, doesn't have a native permission prompt
75-
public void RegisterForPushNotifications() { }
76-
public void promptForPushNotificationsWithUserResponse() {}
75+
public void RegisterForPushNotifications() {}
76+
public void PromptForPushNotificationsWithUserResponse() {}
7777

7878
public void EnableVibrate(bool enable) {
7979
mOneSignal.Call("enableVibrate", enable);
@@ -107,26 +107,26 @@ public void ClearOneSignalNotifications() {
107107
mOneSignal.Call("clearOneSignalNotifications");
108108
}
109109

110-
public void addPermissionObserver() {
110+
public void AddPermissionObserver() {
111111
mOneSignal.Call("addPermissionObserver");
112112
}
113113

114-
public void removePermissionObserver() {
114+
public void RemovePermissionObserver() {
115115
mOneSignal.Call("removePermissionObserver");
116116
}
117117

118-
public void addSubscriptionObserver() {
118+
public void AddSubscriptionObserver() {
119119
mOneSignal.Call("addSubscriptionObserver");
120120
}
121-
public void removeSubscriptionObserver() {
121+
public void RemoveSubscriptionObserver() {
122122
mOneSignal.Call("removeSubscriptionObserver");
123123
}
124124

125-
public void addEmailSubscriptionObserver() {
125+
public void AddEmailSubscriptionObserver() {
126126
mOneSignal.Call("addEmailSubscriptionObserver");
127127
}
128128

129-
public void removeEmailSubscriptionObserver() {
129+
public void RemoveEmailSubscriptionObserver() {
130130
mOneSignal.Call("removeEmailSubscriptionObserver");
131131
}
132132

@@ -150,23 +150,23 @@ public void RemoveExternalUserId() {
150150
mOneSignal.Call("removeExternalUserId");
151151
}
152152

153-
public OSPermissionSubscriptionState getPermissionSubscriptionState() {
154-
return OneSignalPlatformHelper.parsePermissionSubscriptionState(this, mOneSignal.Call<string>("getPermissionSubscriptionState"));
153+
public OSPermissionSubscriptionState GetPermissionSubscriptionState() {
154+
return OneSignalPlatformHelper.ParsePermissionSubscriptionState(this, mOneSignal.Call<string>("getPermissionSubscriptionState"));
155155
}
156156

157-
public OSPermissionStateChanges parseOSPermissionStateChanges(string jsonStat) {
158-
return OneSignalPlatformHelper.parseOSPermissionStateChanges(this, jsonStat);
157+
public OSPermissionStateChanges ParseOSPermissionStateChanges(string jsonStat) {
158+
return OneSignalPlatformHelper.ParseOSPermissionStateChanges(this, jsonStat);
159159
}
160160

161-
public OSSubscriptionStateChanges parseOSSubscriptionStateChanges(string jsonStat) {
162-
return OneSignalPlatformHelper.parseOSSubscriptionStateChanges(this, jsonStat);
161+
public OSSubscriptionStateChanges ParseOSSubscriptionStateChanges(string jsonStat) {
162+
return OneSignalPlatformHelper.ParseOSSubscriptionStateChanges(this, jsonStat);
163163
}
164164

165-
public OSEmailSubscriptionStateChanges parseOSEmailSubscriptionStateChanges(string jsonState) {
166-
return OneSignalPlatformHelper.parseOSEmailSubscriptionStateChanges (this, jsonState);
165+
public OSEmailSubscriptionStateChanges ParseOSEmailSubscriptionStateChanges(string jsonState) {
166+
return OneSignalPlatformHelper.ParseOSEmailSubscriptionStateChanges (this, jsonState);
167167
}
168168

169-
public OSPermissionState parseOSPermissionState(object stateDict) {
169+
public OSPermissionState ParseOSPermissionState(object stateDict) {
170170
var stateDictCasted = stateDict as Dictionary<string, object>;
171171

172172
var state = new OSPermissionState();
@@ -177,7 +177,7 @@ public OSPermissionState parseOSPermissionState(object stateDict) {
177177
return state;
178178
}
179179

180-
public OSSubscriptionState parseOSSubscriptionState(object stateDict) {
180+
public OSSubscriptionState ParseOSSubscriptionState(object stateDict) {
181181
var stateDictCasted = stateDict as Dictionary<string, object>;
182182

183183
var state = new OSSubscriptionState();
@@ -189,7 +189,7 @@ public OSSubscriptionState parseOSSubscriptionState(object stateDict) {
189189
return state;
190190
}
191191

192-
public OSEmailSubscriptionState parseOSEmailSubscriptionState(object stateDict) {
192+
public OSEmailSubscriptionState ParseOSEmailSubscriptionState(object stateDict) {
193193
var stateDictCasted = stateDict as Dictionary<string, object>;
194194

195195
var state = new OSEmailSubscriptionState ();

‎OneSignalExample/Assets/OneSignal/src/OneSignalIOS.cs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -211,31 +211,31 @@ public void SetInFocusDisplaying(OneSignal.OSInFocusDisplayOption display) {
211211
_setInFocusDisplayType((int) display);
212212
}
213213

214-
public void promptForPushNotificationsWithUserResponse() {
214+
public void PromptForPushNotificationsWithUserResponse() {
215215
_promptForPushNotificationsWithUserResponse();
216216
}
217217

218-
public void addPermissionObserver() {
218+
public void AddPermissionObserver() {
219219
_addPermissionObserver();
220220
}
221221

222-
public void removePermissionObserver() {
222+
public void RemovePermissionObserver() {
223223
_removePermissionObserver();
224224
}
225225

226-
public void addSubscriptionObserver() {
226+
public void AddSubscriptionObserver() {
227227
_addSubscriptionObserver();
228228
}
229229

230-
public void removeSubscriptionObserver() {
230+
public void RemoveSubscriptionObserver() {
231231
_removeSubscriptionObserver();
232232
}
233233

234-
public void addEmailSubscriptionObserver() {
234+
public void AddEmailSubscriptionObserver() {
235235
_addEmailSubscriptionObserver();
236236
}
237237

238-
public void removeEmailSubscriptionObserver() {
238+
public void RemoveEmailSubscriptionObserver() {
239239
_removeEmailSubscriptionObserver();
240240
}
241241

@@ -309,23 +309,23 @@ public void SendOutcomeWithValue(string delegateId, string name, float value) {
309309
_sendOutcomeWithValue(delegateId, name, value);
310310
}
311311

312-
public OSPermissionSubscriptionState getPermissionSubscriptionState() {
313-
return OneSignalPlatformHelper.parsePermissionSubscriptionState(this, _getPermissionSubscriptionState());
312+
public OSPermissionSubscriptionState GetPermissionSubscriptionState() {
313+
return OneSignalPlatformHelper.ParsePermissionSubscriptionState(this, _getPermissionSubscriptionState());
314314
}
315315

316-
public OSPermissionStateChanges parseOSPermissionStateChanges(string jsonStat) {
317-
return OneSignalPlatformHelper.parseOSPermissionStateChanges(this, jsonStat);
316+
public OSPermissionStateChanges ParseOSPermissionStateChanges(string jsonStat) {
317+
return OneSignalPlatformHelper.ParseOSPermissionStateChanges(this, jsonStat);
318318
}
319319

320-
public OSEmailSubscriptionStateChanges parseOSEmailSubscriptionStateChanges(string jsonState) {
321-
return OneSignalPlatformHelper.parseOSEmailSubscriptionStateChanges (this, jsonState);
320+
public OSEmailSubscriptionStateChanges ParseOSEmailSubscriptionStateChanges(string jsonState) {
321+
return OneSignalPlatformHelper.ParseOSEmailSubscriptionStateChanges (this, jsonState);
322322
}
323323

324-
public OSSubscriptionStateChanges parseOSSubscriptionStateChanges(string jsonStat) {
325-
return OneSignalPlatformHelper.parseOSSubscriptionStateChanges(this, jsonStat);
324+
public OSSubscriptionStateChanges ParseOSSubscriptionStateChanges(string jsonStat) {
325+
return OneSignalPlatformHelper.ParseOSSubscriptionStateChanges(this, jsonStat);
326326
}
327327

328-
public OSPermissionState parseOSPermissionState(object stateDict) {
328+
public OSPermissionState ParseOSPermissionState(object stateDict) {
329329
var stateDictCasted = stateDict as Dictionary<string, object>;
330330

331331
var state = new OSPermissionState();
@@ -335,7 +335,7 @@ public OSPermissionState parseOSPermissionState(object stateDict) {
335335
return state;
336336
}
337337

338-
public OSSubscriptionState parseOSSubscriptionState(object stateDict) {
338+
public OSSubscriptionState ParseOSSubscriptionState(object stateDict) {
339339
var stateDictCasted = stateDict as Dictionary<string, object>;
340340

341341
var state = new OSSubscriptionState();
@@ -347,7 +347,7 @@ public OSSubscriptionState parseOSSubscriptionState(object stateDict) {
347347
return state;
348348
}
349349

350-
public OSEmailSubscriptionState parseOSEmailSubscriptionState(object stateDict) {
350+
public OSEmailSubscriptionState ParseOSEmailSubscriptionState(object stateDict) {
351351
var stateDictCasted = stateDict as Dictionary<string, object>;
352352

353353
var state = new OSEmailSubscriptionState();

0 commit comments

Comments
 (0)