Skip to content

Commit 402112c

Browse files
committed
Update iOS api
1 parent ace4ea5 commit 402112c

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeDebug.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void _debugSetLogLevel(int logLevel) {
3434
[OneSignal.Debug setLogLevel:(ONE_S_LOG_LEVEL) logLevel];
3535
}
3636

37-
void _debugSetVisualLevel(int visualLevel) {
38-
[OneSignal.Debug setVisualLevel:(ONE_S_LOG_LEVEL) visualLevel];
37+
void _debugSetAlertLevel(int alertLevel) {
38+
[OneSignal.Debug setAlertLevel:(ONE_S_LOG_LEVEL) alertLevel];
3939
}
4040
}

com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeNotifications.mm

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
typedef void (*BooleanResponseDelegate)(int hashCode, bool response);
3434
typedef void (*StringListenerDelegate)(const char* response);
35-
typedef void (*StateListenerDelegate)(const char* current, const char* previous);
35+
typedef void (*StateListenerDelegate)(const char* current);
3636
typedef bool (*NotificationWillShowDelegate)(const char* notification);
3737

3838
/*
@@ -71,11 +71,10 @@ - (instancetype) init {
7171
return self;
7272
}
7373

74-
- (void)onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
74+
- (void)onOSPermissionChanged:(OSPermissionState*)state {
7575
if (_permissionDelegate != nil) {
76-
auto curr = jsonStringFromDictionary([[stateChanges to] jsonRepresentation]);
77-
auto prev = jsonStringFromDictionary([[stateChanges from] jsonRepresentation]);
78-
_permissionDelegate(curr, prev);
76+
auto curr = jsonStringFromDictionary([state jsonRepresentation]);
77+
_permissionDelegate(curr);
7978
}
8079
}
8180

com.onesignal.unity.ios/Runtime/Plugins/iOS/OneSignalUnityBridgeUser.mm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,16 +133,16 @@ void _userAddEmail(const char* email) {
133133
[OneSignal.User addEmail:TO_NSSTRING(email)];
134134
}
135135

136-
void _userRemoveEmail(const char* email) { // iOS - returns bool
136+
void _userRemoveEmail(const char* email) {
137137
[OneSignal.User removeEmail:TO_NSSTRING(email)];
138138
}
139139

140140
void _userAddSms(const char* smsNumber) {
141-
[OneSignal.User addSmsNumber:TO_NSSTRING(smsNumber)];
141+
[OneSignal.User addSms:TO_NSSTRING(smsNumber)];
142142
}
143143

144-
void _userRemoveSms(const char* smsNumber) { // iOS - returns bool
145-
[OneSignal.User removeSmsNumber:TO_NSSTRING(smsNumber)];
144+
void _userRemoveSms(const char* smsNumber) {
145+
[OneSignal.User removeSms:TO_NSSTRING(smsNumber)];
146146
}
147147

148148
void _userAddTag(const char* key, const char* value) {

com.onesignal.unity.ios/Runtime/iOSDebugManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
namespace OneSignalSDK.iOS.Debug {
3434
internal sealed class iOSDebugManager : IDebugManager {
3535
[DllImport("__Internal")] private static extern void _debugSetLogLevel(int logLevel);
36-
[DllImport("__Internal")] private static extern void _debugSetVisualLevel(int visualLevel);
36+
[DllImport("__Internal")] private static extern void _debugSetAlertLevel(int alertlLevel);
3737

3838
private LogLevel _logLevel = LogLevel.Warn;
3939
private LogLevel _alertLevel = LogLevel.None;
@@ -50,7 +50,7 @@ public LogLevel AlertLevel {
5050
get => _alertLevel;
5151
set {
5252
_alertLevel = value;
53-
_debugSetVisualLevel((int) value);
53+
_debugSetAlertLevel((int) value);
5454
}
5555
}
5656
}

com.onesignal.unity.ios/Runtime/iOSNotificationsManager.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ internal sealed class iOSNotificationsManager : INotificationsManager {
4545
[DllImport("__Internal")] private static extern void _notificationsSetWillShowHandler(NotificationWillShowInForegroundDelegate callback);
4646
[DllImport("__Internal")] private static extern void _notificationsSetOpenedHandler(StringListenerDelegate callback);
4747

48-
public delegate void StateListenerDelegate(string current, string previous);
48+
public delegate void StateListenerDelegate(string current);
4949

5050
private delegate bool NotificationWillShowInForegroundDelegate(string notification);
5151
private delegate void StringListenerDelegate(string response);
@@ -81,11 +81,10 @@ public void Initialize() {
8181
_notificationsSetOpenedHandler(_onOpened);
8282
}
8383

84-
[AOT.MonoPInvokeCallback(typeof(StateListenerDelegate))] // temp
85-
private static void _onPermissionStateChanged(string current, string previous) {
84+
[AOT.MonoPInvokeCallback(typeof(StateListenerDelegate))]
85+
private static void _onPermissionStateChanged(string current) {
8686
var curr = JsonUtility.FromJson<PermissionState>(current);
87-
//var prev = JsonUtility.FromJson<PermissionState>(previous);
88-
UnityMainThreadDispatch.Post(state => _instance.PermissionChanged?.Invoke(curr.reachable));
87+
UnityMainThreadDispatch.Post(state => _instance.PermissionChanged?.Invoke(curr.permission));
8988
}
9089

9190
/// <param name="response">OSNotification</param>
@@ -139,7 +138,7 @@ private static void _fillNotifFromObj(ref Notification notif, object notifObj) {
139138
}
140139

141140
[Serializable] private sealed class PermissionState { // temp
142-
public bool reachable;
141+
public bool permission;
143142
}
144143

145144
[AOT.MonoPInvokeCallback(typeof(BooleanResponseDelegate))]

0 commit comments

Comments
 (0)